diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 21:10:32 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 21:10:32 +0000 |
| commit | d0f824cfbd8951bb948b19d7ff5dce028ce557a5 (patch) | |
| tree | 4698434f439e248887ed732ce445ca036edb16b3 /tests/PipeTest.cpp | |
| parent | 986d681f3e7a7eb6febd9df9fe21a8d277ba2296 (diff) | |
Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)
Reason for revert:
broke all Windows bots
Original issue's description:
> setConfig -> setInfo
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14978
R=robertphillips@google.com, reed@google.com
TBR=reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: epoger@google.com
Review URL: https://codereview.chromium.org/302053002
git-svn-id: http://skia.googlecode.com/svn/trunk@14979 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PipeTest.cpp')
| -rw-r--r-- | tests/PipeTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp index 00a1a3f201..fd98fca7ef 100644 --- a/tests/PipeTest.cpp +++ b/tests/PipeTest.cpp @@ -16,7 +16,8 @@ // Ensures that the pipe gracefully handles drawing an invalid bitmap. static void testDrawingBadBitmap(SkCanvas* pipeCanvas) { SkBitmap badBitmap; - badBitmap.setInfo(SkImageInfo::MakeUnknown(5, 5)); + badBitmap.setConfig(SkImageInfo::Make(5, 5, kUnknown_SkColorType, + kPremul_SkAlphaType)); pipeCanvas->drawBitmap(badBitmap, 0, 0); } @@ -43,7 +44,7 @@ static void testDrawingAfterEndRecording(SkCanvas* canvas) { DEF_TEST(Pipe, reporter) { SkBitmap bitmap; - bitmap.setInfo(SkImageInfo::MakeN32Premul(64, 64)); + bitmap.setConfig(SkImageInfo::MakeN32Premul(64, 64)); SkCanvas canvas(bitmap); PipeController pipeController(&canvas); |