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 /dm | |
| 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 'dm')
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 2 | ||||
| -rw-r--r-- | dm/DMWriteTask.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index a7b1d7b61f..c72f675660 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -37,7 +37,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) { canvas->flush(); SkBitmap bitmap; - bitmap.setInfo(info); + bitmap.setConfig(info); canvas->readPixels(&bitmap, 0, 0); this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap))); diff --git a/dm/DMWriteTask.cpp b/dm/DMWriteTask.cpp index 98ea929288..7c9bb628a7 100644 --- a/dm/DMWriteTask.cpp +++ b/dm/DMWriteTask.cpp @@ -97,7 +97,7 @@ struct PngAndRaw { info, rowBytes, NULL/*ctable*/, subset)); SkASSERT(pixels); - bitmap->setInfo(info, rowBytes); + bitmap->setConfig(info, rowBytes); bitmap->setPixelRef(pixels); return true; } |