Changeset 41295 in webkit

Timestamp:

Feb 27, 2009 12:42:51 PM (15 years ago)

Author:

treat@webkit.org

Message:

2009-02-27 Adam Treat <​adam.treat@torchmobile.com>

Reviewed by Eric Seidel and Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=24227
Ensure that the checkForSolidColor() optimization is correctly triggered
for all cases of drawPattern. Currently, the optimization was not triggered
when the check had not been previously performed via a request for the
image's NativeImagePtr.

Implement the Qt version of the checkForSolidColor() method. Combined with
the bug fix this reduces the time it takes to draw a repeating background
of a 1x1 image from ~50msecs to ~0msecs on my machine.

• platform/graphics/BitmapImage.cpp: (WebCore::BitmapImage::BitmapImage):
• platform/graphics/BitmapImage.h: (WebCore::BitmapImage::mayFillWithSolidColor):
• platform/graphics/Image.h: (WebCore::Image::mayFillWithSolidColor):
• platform/graphics/cairo/ImageCairo.cpp: (WebCore::BitmapImage::BitmapImage):
• platform/graphics/cg/ImageCG.cpp: (WebCore::BitmapImage::BitmapImage): (WebCore::BitmapImage::checkForSolidColor):
• platform/graphics/qt/ImageQt.cpp: (WebCore::BitmapImage::checkForSolidColor):
• platform/graphics/skia/ImageSkia.cpp: (WebCore::BitmapImage::checkForSolidColor):
• platform/graphics/wx/ImageWx.cpp: (WebCore::BitmapImage::checkForSolidColor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (1 diff)
• platform/graphics/BitmapImage.h (modified) (2 diffs)
• platform/graphics/Image.h (modified) (1 diff)
• platform/graphics/cairo/ImageCairo.cpp (modified) (1 diff)
• platform/graphics/cg/ImageCG.cpp (modified) (2 diffs)
• platform/graphics/qt/ImageQt.cpp (modified) (2 diffs)
• platform/graphics/skia/ImageSkia.cpp (modified) (1 diff)
• platform/graphics/wx/ImageWx.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-27  Adam Treat  <adam.treat@torchmobile.com>
+
+        Reviewed by Eric Seidel and Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24227
+        Ensure that the checkForSolidColor() optimization is correctly triggered
+        for all cases of drawPattern.  Currently, the optimization was not triggered
+        when the check had not been previously performed via a request for the
+        image's NativeImagePtr.
+
+        Implement the Qt version of the checkForSolidColor() method.  Combined with
+        the bug fix this reduces the time it takes to draw a repeating background
+        of a 1x1 image from ~50msecs to ~0msecs on my machine.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::BitmapImage):
+        * platform/graphics/BitmapImage.h:
+        (WebCore::BitmapImage::mayFillWithSolidColor):
+        * platform/graphics/Image.h:
+        (WebCore::Image::mayFillWithSolidColor):
+        * platform/graphics/cairo/ImageCairo.cpp:
+        (WebCore::BitmapImage::BitmapImage):
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::BitmapImage::BitmapImage):
+        (WebCore::BitmapImage::checkForSolidColor):
+        * platform/graphics/qt/ImageQt.cpp:
+        (WebCore::BitmapImage::checkForSolidColor):
+        * platform/graphics/skia/ImageSkia.cpp:
+        (WebCore::BitmapImage::checkForSolidColor):
+        * platform/graphics/wx/ImageWx.cpp:
+        (WebCore::BitmapImage::checkForSolidColor):
+
 2009-02-27  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/platform/graphics/BitmapImage.cpp

@@ -54 +54 @@
     , m_desiredFrameStartTime(0)
     , m_isSolidColor(false)
+    , m_checkedForSolidColor(false)
     , m_animationFinished(false)
     , m_allDataReceived(false)

trunk/WebCore/platform/graphics/BitmapImage.h

@@ -209 +209 @@
     
     // Checks to see if the image is a 1x1 solid color.  We optimize these images and just do a fill rect instead.
+    // This check should happen regardless whether m_checkedForSolidColor is already set, as the frame may have
+    // changed.
     void checkForSolidColor();
     
-    virtual bool mayFillWithSolidColor() const { return m_isSolidColor && m_currentFrame == 0; }
+    virtual bool mayFillWithSolidColor()
+    {
+        if (!m_checkedForSolidColor) {
+            ASSERT(m_haveFrameCount);
+            checkForSolidColor();
+            ASSERT(m_checkedForSolidColor);
+        }
+        return m_isSolidColor && m_currentFrame == 0;
+    }
     virtual Color solidColor() const { return m_solidColor; }
     
@@ -233 +243 @@
     Color m_solidColor;  // If we're a 1x1 solid color, this is the color to use to fill.
     bool m_isSolidColor;  // Whether or not we are a 1x1 solid image.
+    bool m_checkedForSolidColor; // Whether we've checked the frame for solid color.
 
     bool m_animationFinished;  // Whether or not we've completed the entire animation.

trunk/WebCore/platform/graphics/Image.h

@@ -156 +156 @@
 
     // Supporting tiled drawing
-    virtual bool mayFillWithSolidColor() const { return false; }
+    virtual bool mayFillWithSolidColor() { return false; }
     virtual Color solidColor() const { return Color(); }
     

trunk/WebCore/platform/graphics/cairo/ImageCairo.cpp

@@ -61 +61 @@
     , m_repetitionsComplete(0)
     , m_isSolidColor(false)
+    , m_checkedForSolidColor(false)
     , m_animationFinished(true)
     , m_allDataReceived(true)

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

@@ -74 +74 @@
     , m_repetitionsComplete(0)
     , m_isSolidColor(false)
+    , m_checkedForSolidColor(false)
     , m_animationFinished(true)
     , m_allDataReceived(true)
@@ -100 +101 @@
 void BitmapImage::checkForSolidColor()
 {
+    m_checkedForSolidColor = true;
     if (frameCount() > 1)
         m_isSolidColor = false;

trunk/WebCore/platform/graphics/qt/ImageQt.cpp

@@ -3 +3 @@
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>
+ * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
  *
  * All rights reserved.
@@ -158 +159 @@
 void BitmapImage::checkForSolidColor()
 {
-    // FIXME: It's easy to implement this optimization. Just need to check the RGBA32 buffer to see if it is 1x1.
     m_isSolidColor = false;
+    m_checkedForSolidColor = true;
+
+    if (frameCount() > 1)
+        return;
+
+    QPixmap* framePixmap = frameAtIndex(0);
+    if (!framePixmap || framePixmap->width() != 1 || framePixmap->height() != 1)
+        return;
+
+    m_isSolidColor = true;
+    m_solidColor = QColor(framePixmap->toImage().pixel(0, 0));
 }
 

trunk/WebCore/platform/graphics/skia/ImageSkia.cpp

@@ -401 +401 @@
 void BitmapImage::checkForSolidColor()
 {
+    m_checkedForSolidColor = true;
 }
 

trunk/WebCore/platform/graphics/wx/ImageWx.cpp

@@ -238 +238 @@
 void BitmapImage::checkForSolidColor()
 {
-
+    m_checkedForSolidColor = true;
 }