Changeset 93441 in webkit

Timestamp:

Aug 19, 2011 2:50:10 PM (13 years ago)

Author:

jamesr@google.com

Message:

REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chromium Mac
​https://bugs.webkit.org/show_bug.cgi?id=65063

Reviewed by Darin Fisher.

Fixes crashes due to a bad cast from Image to BitmapImage on skia ports
that use BitmapImageSingleFrameSkia. In the skia port
Image::isBitmapImage() returning true does not necessarily mean that
Image is of type BitmapImage.

Covered by fast/canvas/canvas-as-image.html and many other canvas
tests.

Patch originally by Tom Hudson.

• platform/graphics/BitmapImage.h:

(WebCore::BitmapImage::currentFrameHasAlpha):
(WebCore::BitmapImage::notSolidColor):

• platform/graphics/Image.cpp:

(WebCore::Image::drawTiled):

• platform/graphics/Image.h:

(WebCore::Image::currentFrameHasAlpha):
(WebCore::Image::notSolidColor):

• platform/graphics/skia/BitmapImageSingleFrameSkia.h:

(WebCore::BitmapImageSingleFrameSkia::currentFrameHasAlpha):
(WebCore::BitmapImageSingleFrameSkia::notSolidColor):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::backgroundIsObscured):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.h (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (1 diff)
• platform/graphics/Image.h (modified) (2 diffs)
• platform/graphics/skia/BitmapImageSingleFrameSkia.h (modified) (2 diffs)
• rendering/RenderImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-19  James Robinson  <jamesr@chromium.org>
+
+        REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chromium Mac
+        https://bugs.webkit.org/show_bug.cgi?id=65063
+
+        Reviewed by Darin Fisher.
+
+        Fixes crashes due to a bad cast from Image to BitmapImage on skia ports
+        that use BitmapImageSingleFrameSkia. In the skia port
+        Image::isBitmapImage() returning true does not necessarily mean that
+        Image is of type BitmapImage.
+
+        Covered by fast/canvas/canvas-as-image.html and many other canvas
+        tests.
+
+        Patch originally by Tom Hudson.
+
+        * platform/graphics/BitmapImage.h:
+        (WebCore::BitmapImage::currentFrameHasAlpha):
+        (WebCore::BitmapImage::notSolidColor):
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::drawTiled):
+        * platform/graphics/Image.h:
+        (WebCore::Image::currentFrameHasAlpha):
+        (WebCore::Image::notSolidColor):
+        * platform/graphics/skia/BitmapImageSingleFrameSkia.h:
+        (WebCore::BitmapImageSingleFrameSkia::currentFrameHasAlpha):
+        (WebCore::BitmapImageSingleFrameSkia::notSolidColor):
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::backgroundIsObscured):
+
 2011-08-19  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.h

@@ -160 +160 @@
     virtual NativeImagePtr nativeImageForCurrentFrame() { return frameAtIndex(currentFrame()); }
     bool frameHasAlphaAtIndex(size_t);
-    bool currentFrameHasAlpha() { return frameHasAlphaAtIndex(currentFrame()); }
+    virtual bool currentFrameHasAlpha() { return frameHasAlphaAtIndex(currentFrame()); }
 
 #if !ASSERT_DISABLED
-    bool notSolidColor()
+    virtual bool notSolidColor()
     {
         return size().width() != 1 || size().height() != 1 || frameCount() > 1;

trunk/Source/WebCore/platform/graphics/Image.cpp

@@ -116 +116 @@
     // See <https://webkit.org/b/59043>.
 #if !PLATFORM(WX)
-    ASSERT(!isBitmapImage() || static_cast<BitmapImage*>(this)->notSolidColor());
+    ASSERT(!isBitmapImage() || notSolidColor());
 #endif
 

trunk/Source/WebCore/platform/graphics/Image.h

@@ -89 +89 @@
 
     virtual bool isBitmapImage() const { return false; }
+    virtual bool currentFrameHasAlpha() { return false; }
 
     // Derived classes should override this if they can assure that 
@@ -158 +159 @@
                              const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
 
+#if !ASSERT_DISABLED
+    virtual bool notSolidColor() { return true; }
+#endif
+
 protected:
     Image(ImageObserver* = 0);

trunk/Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h

@@ -54 +54 @@
     virtual bool isBitmapImage() const { return true; }
 
+    virtual bool currentFrameHasAlpha() { return !m_nativeImage.isOpaque(); }
+
     virtual IntSize size() const
     {
@@ -73 +75 @@
     }
 
+#if !ASSERT_DISABLED
+    virtual bool notSolidColor()
+    {
+        return m_nativeImage.width() != 1 || m_nativeImage.height() != 1;
+    }
+#endif
+
 protected:
     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator);

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -409 +409 @@
     // Check for bitmap image with alpha.
     Image* image = m_imageResource->image().get();
-    if (!image || !image->isBitmapImage())
+    if (!image || !image->isBitmapImage() || image->currentFrameHasAlpha())
         return false;
         
-    BitmapImage* bitmapImage = static_cast<BitmapImage*>(image);
-    if (bitmapImage->currentFrameHasAlpha())
-        return false;
-
     return true;
 }