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 /dm | |
| 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 '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 c72f675660..a7b1d7b61f 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -37,7 +37,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) { canvas->flush(); SkBitmap bitmap; - bitmap.setConfig(info); + bitmap.setInfo(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 7c9bb628a7..98ea929288 100644 --- a/dm/DMWriteTask.cpp +++ b/dm/DMWriteTask.cpp @@ -97,7 +97,7 @@ struct PngAndRaw { info, rowBytes, NULL/*ctable*/, subset)); SkASSERT(pixels); - bitmap->setConfig(info, rowBytes); + bitmap->setInfo(info, rowBytes); bitmap->setPixelRef(pixels); return true; } |