Changeset 145366 in webkit

Timestamp:

Mar 11, 2013 8:43:06 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] Enable tiled shadow blur for inset box shadows
​https://bugs.webkit.org/show_bug.cgi?id=111736

Reviewed by Noam Rosenthal.

Paint inset box-shadows using the optimized tiled shadow blur, instead of
applying shadow blur to the entire painted rect.

This optimizes the default CSS on common pastebin sites.

Tested by existing tests.

• platform/graphics/GraphicsContext.cpp:
• platform/graphics/ShadowBlur.cpp:

(WebCore::ShadowBlur::drawInsetShadowWithTiling):

Must set fill color before calling clearShadow, as that might clear m_color.

(WebCore::ShadowBlur::drawLayerPieces):

Ditto.

• platform/graphics/qt/GraphicsContextQt.cpp:

(WebCore::GraphicsContext::fillPath):
(WebCore::GraphicsContext::fillRectWithRoundedHole):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• platform/graphics/ShadowBlur.cpp (modified) (2 diffs)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Enable tiled shadow blur for inset box shadows
+        https://bugs.webkit.org/show_bug.cgi?id=111736
+
+        Reviewed by Noam Rosenthal.
+
+        Paint inset box-shadows using the optimized tiled shadow blur, instead of
+        applying shadow blur to the entire painted rect.
+
+        This optimizes the default CSS on common pastebin sites.
+
+        Tested by existing tests.
+
+        * platform/graphics/GraphicsContext.cpp:
+        * platform/graphics/ShadowBlur.cpp:
+        (WebCore::ShadowBlur::drawInsetShadowWithTiling):
+            Must set fill color before calling clearShadow, as that might clear m_color.
+        (WebCore::ShadowBlur::drawLayerPieces):
+            Ditto.
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::fillRectWithRoundedHole):
+
 2013-03-11  Alberto Garcia  <agarcia@igalia.com>
 

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

@@ -678 +678 @@
 }
 
-#if !USE(CG)
+#if !USE(CG) && !PLATFORM(QT)
 void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
 {

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

@@ -697 +697 @@
     {
         GraphicsContextStateSaver fillStateSaver(*graphicsContext);
-        graphicsContext->clearShadow();
         graphicsContext->setFillRule(RULE_EVENODD);
         graphicsContext->setFillColor(m_color, m_colorSpace);
+        graphicsContext->clearShadow();
         graphicsContext->fillPath(exteriorPath);
     }
@@ -773 +773 @@
 
     GraphicsContextStateSaver stateSaver(*graphicsContext);
+    graphicsContext->setFillColor(m_color, m_colorSpace);
     graphicsContext->clearShadow();
-    graphicsContext->setFillColor(m_color, m_colorSpace);
 
     // Note that drawing the ImageBuffer is faster than creating a Image and drawing that,

trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -865 +865 @@
 }
 
+void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
+{
+    if (paintingDisabled() || !color.isValid())
+        return;
+
+    Path path;
+    path.addRect(rect);
+    if (!roundedHoleRect.radii().isZero())
+        path.addRoundedRect(roundedHoleRect);
+    else
+        path.addRect(roundedHoleRect.rect());
+
+    QPainterPath platformPath = path.platformPath();
+    platformPath.setFillRule(Qt::OddEvenFill);
+
+    QPainter* p = m_data->p();
+    if (hasShadow()) {
+        ShadowBlur* shadow = shadowBlur();
+        if (shadow->mustUseShadowBlur(this))
+            shadow->drawInsetShadow(this, rect, roundedHoleRect.rect(), roundedHoleRect.radii());
+        else {
+            const QPointF shadowOffset(m_state.shadowOffset.width(), m_state.shadowOffset.height());
+            p->translate(shadowOffset);
+            p->fillPath(platformPath, QColor(m_state.shadowColor));
+            p->translate(-shadowOffset);
+        }
+    }
+
+    p->fillPath(platformPath, QColor(color));
+}
+
 bool GraphicsContext::isInTransparencyLayer() const
 {