diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 13:26:10 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 13:26:10 +0000 |
commit | a3264e53ee3f3c5d6a2c813df7e44b5b96d207f2 (patch) | |
tree | 5a95db31ba21ba5f0354b3e9e622a046fe6e04c4 /tests/PipeTest.cpp | |
parent | 16fdbd3141f23a348e4b9f706e77307a947bd5a2 (diff) |
Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)"
This reverts commit eecaea4148805834f223681f70b6488ceba12d09.
R=robertphillips@google.com, scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/301283003
git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PipeTest.cpp')
-rw-r--r-- | tests/PipeTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp index fd98fca7ef..00a1a3f201 100644 --- a/tests/PipeTest.cpp +++ b/tests/PipeTest.cpp @@ -16,8 +16,7 @@ // Ensures that the pipe gracefully handles drawing an invalid bitmap. static void testDrawingBadBitmap(SkCanvas* pipeCanvas) { SkBitmap badBitmap; - badBitmap.setConfig(SkImageInfo::Make(5, 5, kUnknown_SkColorType, - kPremul_SkAlphaType)); + badBitmap.setInfo(SkImageInfo::MakeUnknown(5, 5)); pipeCanvas->drawBitmap(badBitmap, 0, 0); } @@ -44,7 +43,7 @@ static void testDrawingAfterEndRecording(SkCanvas* canvas) { DEF_TEST(Pipe, reporter) { SkBitmap bitmap; - bitmap.setConfig(SkImageInfo::MakeN32Premul(64, 64)); + bitmap.setInfo(SkImageInfo::MakeN32Premul(64, 64)); SkCanvas canvas(bitmap); PipeController pipeController(&canvas); |