Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / lazy / SkDiscardablePixelRef.cpp

diff --git a/src/third_party/skia/src/lazy/SkDiscardablePixelRef.cpp b/src/third_party/skia/src/lazy/SkDiscardablePixelRef.cpp
index ce38a4a..ec8d5ea 100644 (file)
--- a/src/third_party/skia/src/lazy/SkDiscardablePixelRef.cpp
+++ b/src/third_party/skia/src/lazy/SkDiscardablePixelRef.cpp
@@ -105,9 +105,12 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst,
         || (!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();
+        return dst->tryAllocPixels();
     }
     SkAutoTUnref<SkDiscardablePixelRef> ref(
         SkNEW_ARGS(SkDiscardablePixelRef,