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 /src/lazy | |
| 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 'src/lazy')
| -rw-r--r-- | src/lazy/SkCachingPixelRef.cpp | 4 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index 76510f63cd..f1510fb67c 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -14,7 +14,7 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator, SkASSERT(dst != NULL); if ((NULL == generator) || !(generator->getInfo(&info)) - || !dst->setInfo(info)) { + || !dst->setConfig(info, 0)) { SkDELETE(generator); return false; } @@ -54,7 +54,7 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) { &bitmap); if (NULL == fScaledCacheId) { // Cache has been purged, must re-decode. - if ((!bitmap.setInfo(info, fRowBytes)) || !bitmap.allocPixels()) { + if ((!bitmap.setConfig(info, fRowBytes)) || !bitmap.allocPixels()) { fErrorInDecoding = true; return false; } diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index f0d7affdc8..53e9d1ab62 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -102,7 +102,7 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, SkAutoTDelete<SkImageGenerator> autoGenerator(generator); if ((NULL == autoGenerator.get()) || (!autoGenerator->getInfo(&info)) - || (!dst->setInfo(info))) { + || (!dst->setConfig(info, 0))) { return false; } SkASSERT(dst->colorType() != kUnknown_SkColorType); |