commit b75b2c05b999e26343e095eabff646705a0091ae
author reed <reed@google.com> Fri Aug 29 08:23:55 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Aug 29 08:23:56 2014 -0700
tree 73ad20ea74265d412dea296f45e5e6397fcc6e72
parent 7187593b4b99529e9386f259639191ba750ed355

use possible corrected info when creating pixelref

TBR=halcanary, scroggo

Author: reed@google.com

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

src/lazy/SkDiscardablePixelRef.cpp

diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp
index ce38a4a..a86c3de 100644
--- a/src/lazy/SkDiscardablePixelRef.cpp
+++ b/src/lazy/SkDiscardablePixelRef.cpp
@@ -105,7 +105,10 @@
         || (!dst->setInfo(info))) {
         return false;
     }
-    SkASSERT(dst->colorType() != kUnknown_SkColorType);
+    // Since dst->setInfo() may have changed/fixed-up info, we copy it back from that bitmap
+    info = dst->info();
+
+    SkASSERT(info.colorType() != kUnknown_SkColorType);
     if (dst->empty()) {  // Use a normal pixelref.
         return dst->allocPixels();
     }