Changeset 84321 in webkit

Timestamp:

Apr 19, 2011 5:35:58 PM (13 years ago)

Author:

psolanki@apple.com

Message:

BitmapImage::destroyMetadataAndNotify should clear m_checkedForSolidColor
​https://bugs.webkit.org/show_bug.cgi?id=58926

Reviewed by Simon Fraser.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::destroyMetadataAndNotify): Set m_checkedForSolidColor to false.

• platform/graphics/BitmapImage.h:

(WebCore::BitmapImage::assertNotSolidColor):

• platform/graphics/cg/ImageCG.cpp:

(WebCore::Image::drawPattern): Add assert to make sure this is not called for a 1x1 image.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (1 diff)
• platform/graphics/BitmapImage.h (modified) (1 diff)
• platform/graphics/cg/ImageCG.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        BitmapImage::destroyMetadataAndNotify should clear m_checkedForSolidColor
+        https://bugs.webkit.org/show_bug.cgi?id=58926
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::destroyMetadataAndNotify): Set m_checkedForSolidColor to false.
+        * platform/graphics/BitmapImage.h:
+        (WebCore::BitmapImage::assertNotSolidColor):
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::Image::drawPattern): Add assert to make sure this is not called for a 1x1 image.
+
 2011-04-19  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -104 +104 @@
 {
     m_isSolidColor = false;
+    m_checkedForSolidColor = false;
     invalidatePlatformData();
 

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

@@ -160 +160 @@
     bool frameHasAlphaAtIndex(size_t); 
 
+#if !ASSERT_DISABLED
+    bool notSolidColor()
+    {
+        return size().width() != 1 || size().height() != 1 || frameCount() > 1;
+    }
+#endif
+
 protected:
     enum RepetitionCountStatus {

trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp

@@ -269 +269 @@
         return;
 
+#if !ASSERT_DISABLED
+    if (this->isBitmapImage())
+        ASSERT(static_cast<BitmapImage*>(this)->notSolidColor());
+#endif
+
     CGContextRef context = ctxt->platformContext();
     ctxt->save();