| commit | e13af711d4ff9031c9ed3054a4c33a56a0c62e1f | [log] [tgz] |
|---|---|---|
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Jan 13 20:39:14 2014 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Jan 13 20:39:14 2014 +0000 |
| tree | 6ffdbe491bde75147efead8c9d21b5d6ebae045e | |
| parent | f0b56e74485d59465194b21f89fa3bc3a7962ac6 [diff] [blame] |
Revert of https://codereview.chromium.org/132643007/ 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
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index f5026c7..f1510fb 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp
@@ -12,13 +12,15 @@ 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; }