Changeset 84213 in webkit

Timestamp:

Apr 18, 2011 6:35:15 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-18 John Bauman <​jbauman@chromium.org>

Reviewed by Kenneth Russell.

Don't cast BitmapImageSingleFrameSkia to BitmapImage
​https://bugs.webkit.org/show_bug.cgi?id=58821

BitmapImageSingleFrameSkia has isBitmap return true, but
can't be cast to a BitmapImage. Instead of using BitmapImage,
use isOpaque from SkBitmap to determine if the image has alpha.

No new tests.

• platform/graphics/skia/GraphicsContext3DSkia.cpp: (WebCore::GraphicsContext3D::getImageData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/GraphicsContext3DSkia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-18  John Bauman  <jbauman@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Don't cast BitmapImageSingleFrameSkia to BitmapImage
+        https://bugs.webkit.org/show_bug.cgi?id=58821
+
+        BitmapImageSingleFrameSkia has isBitmap return true, but
+        can't be cast to a BitmapImage. Instead of using BitmapImage,
+        use isOpaque from SkBitmap to determine if the image has alpha.
+
+        No new tests.
+
+        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+
 2011-04-18  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp

@@ -52 +52 @@
         return false;
     OwnPtr<NativeImageSkia> pixels;
-    NativeImageSkia* skiaImage = 0;
+    NativeImageSkia* skiaImage = image->nativeImageForCurrentFrame();
     AlphaOp neededAlphaOp = AlphaDoNothing;
-    bool hasAlpha = image->isBitmapImage() ? static_cast<BitmapImage*>(image)->frameHasAlphaAtIndex(0) : true;
-    if ((ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && image->data()) {
+    bool hasAlpha = skiaImage ? !skiaImage->isOpaque() : true;
+    if ((!skiaImage || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && image->data()) {
         ImageSource decoder(ImageSource::AlphaNotPremultiplied,
                             ignoreGammaAndColorProfile ? ImageSource::GammaAndColorProfileIgnored : ImageSource::GammaAndColorProfileApplied);
@@ -72 +72 @@
         if (hasAlpha && premultiplyAlpha)
             neededAlphaOp = AlphaDoPremultiply;
-    } else {
-        skiaImage = image->nativeImageForCurrentFrame();
-        if (!premultiplyAlpha && hasAlpha)
-            neededAlphaOp = AlphaDoUnmultiply;
-    }
+    } else if (!premultiplyAlpha && hasAlpha)
+        neededAlphaOp = AlphaDoUnmultiply;
     if (!skiaImage)
         return false;