Changeset 89221 in webkit

Timestamp:

Jun 19, 2011 1:48:17 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-19 Una Sabovic <​una.sabovic@palm.com>

Reviewed by Darin Adler.

Optimization: avoid call to clearRect() when bgColor is valid when painting the root background in RenderBoxModelObject::paintFillLayerExtended
​https://bugs.webkit.org/show_bug.cgi?id=62908

When root layers base color is fully transparent backgroundRect was cleared before bgColor is applied.
Instead of clearing the rect we apply CompositeCopy operation when painting the background color.

No new tests. This is an optimization, it doesn't change any existing functionality.

• platform/graphics/GraphicsContext.cpp: (WebCore::GraphicsContext::fillRect):
• platform/graphics/GraphicsContext.h:
• rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::paintFillLayerExtended):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-19  Una Sabovic  <una.sabovic@palm.com>
+
+        Reviewed by Darin Adler.
+
+        Optimization: avoid call to clearRect() when bgColor is valid when painting the root background in RenderBoxModelObject::paintFillLayerExtended
+        https://bugs.webkit.org/show_bug.cgi?id=62908
+
+        When root layers base color is fully transparent backgroundRect was cleared before bgColor is applied.
+        Instead of clearing the rect we apply CompositeCopy operation when painting the background color.
+
+        No new tests. This is an optimization, it doesn't change any existing functionality.
+
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::fillRect):
+        * platform/graphics/GraphicsContext.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+
 2011-06-19  Dirk Schulze  <krit@webkit.org>
 

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

@@ -614 +614 @@
 }
 
+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace styleColorSpace, CompositeOperator op)
+{
+    if (paintingDisabled())
+        return;
+
+    CompositeOperator previousOperator = compositeOperation();
+    setCompositeOperation(op);
+    fillRect(rect, color, styleColorSpace);
+    setCompositeOperation(previousOperator);
+}
+
 void GraphicsContext::fillRoundedRect(const RoundedIntRect& rect, const Color& color, ColorSpace colorSpace)
 {

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

@@ -294 +294 @@
         void fillRect(const FloatRect&, const Color&, ColorSpace);
         void fillRect(const FloatRect&, Generator&);
+        void fillRect(const FloatRect&, const Color&, ColorSpace, CompositeOperator);
         void fillRoundedRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color&, ColorSpace);
         void fillRoundedRect(const RoundedIntRect&, const Color&, ColorSpace);

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -743 +743 @@
         // If we have an alpha and we are painting the root element, go ahead and blend with the base background color.
         Color baseColor;
+        bool shouldClearBackground = false;
         if (isOpaqueRoot) {
             baseColor = view()->frameView()->baseBackgroundColor();
             if (!baseColor.alpha())
-                context->clearRect(backgroundRect);
-        }
-
-        if (baseColor.alpha() > 0) {
+                shouldClearBackground = true;
+        }
+
+        if (baseColor.alpha()) {
             if (bgColor.alpha())
                 baseColor = baseColor.blend(bgColor);
 
-            CompositeOperator previousOperator = context->compositeOperation();
-            context->setCompositeOperation(CompositeCopy);
-            context->fillRect(backgroundRect, baseColor, style()->colorSpace());
-            context->setCompositeOperation(previousOperator);
-        } else if (bgColor.alpha() > 0)
-            context->fillRect(backgroundRect, bgColor, style()->colorSpace());
+            context->fillRect(backgroundRect, baseColor, style()->colorSpace(), CompositeCopy);
+        } else if (bgColor.alpha()) {
+            CompositeOperator operation = shouldClearBackground ? CompositeCopy : context->compositeOperation();
+            context->fillRect(backgroundRect, bgColor, style()->colorSpace(), operation);
+        } else if (shouldClearBackground)
+            context->clearRect(backgroundRect);
     }