cloned from https://codereview.chromium.org/302923003/

BUG=

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

git-svn-id: svn://svn.chromium.org/blink/trunk@175101 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/graphics/DiscardablePixelRef.cpp

@@ -48,8 +48,8 @@ bool DiscardablePixelRefAllocator::allocPixelRef(SkBitmap* dst, SkColorTable* ct
     if (size < 0 || !sk_64_isS32(size))
         return false;
 
-    SkImageInfo info;
-    if (!dst->asImageInfo(&info))
+    const SkImageInfo& info = dst->info();
+    if (kUnknown_SkColorType == info.colorType())
         return false;
 
     SkAutoTUnref<DiscardablePixelRef> pixelRef(new DiscardablePixelRef(info, dst->rowBytes(), adoptPtr(new SkMutex())));

third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp

@@ -52,14 +52,14 @@ public:
 
     virtual bool allocPixelRef(SkBitmap* dst, SkColorTable* ctable) OVERRIDE
     {
-        SkImageInfo info;
-        if (!dst->asImageInfo(&info))
+        const SkImageInfo& info = dst->info();
+        if (kUnknown_SkColorType == info.colorType())
             return false;
 
         if (info != m_info || m_rowBytes != dst->rowBytes())
             return false;
 
-        if (!dst->installPixels(m_info, m_pixels, m_rowBytes, 0, 0))
+        if (!dst->installPixels(m_info, m_pixels, m_rowBytes))
             return false;
         dst->lockPixels();
         return true;

third_party/WebKit/Source/platform/graphics/test/MockDiscardablePixelRef.h

@@ -51,10 +51,9 @@ public:
     class Allocator : public SkBitmap::Allocator {
     public:
         virtual bool allocPixelRef(SkBitmap* dst, SkColorTable* ct) SK_OVERRIDE {
-            SkImageInfo info;
-            if (!dst->asImageInfo(&info)) {
+            const SkImageInfo& info = dst->info();
+            if (kUnknown_SkColorType == info.colorType())
                 return false;
-            }
             SkAutoTUnref<SkPixelRef> pr(new MockDiscardablePixelRef(info, dst->rowBytes()));
             dst->setPixelRef(pr);
             return true;