commit 9b06ba4c91484d09565ff4a572d8c5af15dd429e
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 13 20:23:48 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 13 20:23:48 2014 +0000
tree 6ffdbe491bde75147efead8c9d21b5d6ebae045e
parent dd9ea9262cb61b545fcf414fbde677eb2b62fee4

Revert of https://codereview.chromium.org/129423002/
Reason for revert: broke tests (compile)

R=scroggo@google.com, halcanary@google.com
TBR=halcanary@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=

Author: reed@google.com

Review URL: https://codereview.chromium.org/137133003

git-svn-id: http://skia.googlecode.com/svn/trunk@13056 2bbb7eff-a529-9590-31e7-b0007b416f81

src/lazy/SkCachingPixelRef.cpp

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;
 }