diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:39:14 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:39:14 +0000 |
| commit | e13af711d4ff9031c9ed3054a4c33a56a0c62e1f (patch) | |
| tree | 6ffdbe491bde75147efead8c9d21b5d6ebae045e /src/lazy | |
| parent | f0b56e74485d59465194b21f89fa3bc3a7962ac6 (diff) | |
Reason for revert: broken tests
TBR=
NOTREECHECKS=true
NOTRY=true
BUG=
Author: reed@google.com
Review URL: https://codereview.chromium.org/134843008
git-svn-id: http://skia.googlecode.com/svn/trunk@13058 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/lazy')
| -rw-r--r-- | src/lazy/SkCachingPixelRef.cpp | 6 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index f5026c7365..f1510fb67c 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -12,13 +12,15 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator, SkBitmap* dst) { SkImageInfo info; SkASSERT(dst != NULL); - if (!generator || !generator->getInfo(&info)) { + if ((NULL == generator) + || !(generator->getInfo(&info)) + || !dst->setConfig(info, 0)) { SkDELETE(generator); return false; } SkAutoTUnref<SkCachingPixelRef> ref(SkNEW_ARGS(SkCachingPixelRef, (info, generator, dst->rowBytes()))); - dst->installPixelRef(ref); + dst->setPixelRef(ref); return true; } diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index eb5c2f9ab3..abd80f2e0a 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -94,6 +94,6 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkAutoTUnref<SkDiscardablePixelRef> ref( SkNEW_ARGS(SkDiscardablePixelRef, (info, autoGenerator.detach(), dst->rowBytes(), factory))); - dst->installPixelRef(ref); + dst->setPixelRef(ref); return true; } |