Changeset 118020 in webkit

Timestamp:

May 22, 2012 12:23:18 PM (12 years ago)

Author:

rafael.lobo@openbossa.org

Message:

[Qt] canvas/philip/tests/2d.path.stroke.overlap.html fails with Qt-4.6.2 or higher
​https://bugs.webkit.org/show_bug.cgi?id=40362

Reviewed by Noam Rosenthal.

Source/WebCore:

Before drawing the stroke from a certain path, it should make the union of the stroke areas.
The previous implementation didn't consider that so the intersection was painted twice.
By using QPainterPathStroker, we create a QPainterPath on top of the platform path, and
then we fill it with the expected brush. This way we avoid repainting areas.

• platform/graphics/qt/GraphicsContextQt.cpp:

(WebCore::fillPathStroke):
(WebCore):
(WebCore::GraphicsContext::strokePath):

LayoutTests:

• platform/qt/Skipped: Unskip test after fix.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-22  Rafael Brandao  <rafael.lobo@openbossa.org>
+
+        [Qt] canvas/philip/tests/2d.path.stroke.overlap.html fails with Qt-4.6.2 or higher
+        https://bugs.webkit.org/show_bug.cgi?id=40362
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/qt/Skipped: Unskip test after fix.
+
 2012-05-22  Emil A Eklund  <eae@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2124 +2124 @@
 # ============================================================================= #
 
-# [Qt] canvas/philip/tests/2d.path.stroke.overlap.html fails with Qt-4.6.2 or higher
-# https://bugs.webkit.org/show_bug.cgi?id=40362
-canvas/philip/tests/2d.path.stroke.overlap.html
-
 # [Qt] editing/execCommand/move-selection-back-line.html fails with Qt >= 4.7.1
 # https://bugs.webkit.org/show_bug.cgi?id=50144

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Rafael Brandao  <rafael.lobo@openbossa.org>
+
+        [Qt] canvas/philip/tests/2d.path.stroke.overlap.html fails with Qt-4.6.2 or higher
+        https://bugs.webkit.org/show_bug.cgi?id=40362
+
+        Reviewed by Noam Rosenthal.
+
+        Before drawing the stroke from a certain path, it should make the union of the stroke areas.
+        The previous implementation didn't consider that so the intersection was painted twice.
+        By using QPainterPathStroker, we create a QPainterPath on top of the platform path, and
+        then we fill it with the expected brush. This way we avoid repainting areas.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::fillPathStroke):
+        (WebCore):
+        (WebCore::GraphicsContext::strokePath):
+
 2012-05-21  Gavin Barraclough  <barraclough@apple.com>
 

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

@@ -60 +60 @@
 #include <QPainter>
 #include <QPainterPath>
+#include <QPainterPathStroker>
 #include <QPixmap>
 #include <QPolygonF>
@@ -528 +529 @@
 }
 
+inline static void fillPathStroke(QPainter* painter, QPainterPathStroker& pathStroker, const QPainterPath& platformPath, const QBrush& brush)
+{
+    QPainterPath stroke = pathStroker.createStroke(platformPath);
+    painter->fillPath(stroke, brush);
+}
+
 void GraphicsContext::strokePath(const Path& path)
 {
@@ -537 +544 @@
     QPainterPath platformPath = path.platformPath();
     platformPath.setFillRule(toQtFillRule(fillRule()));
+    QPainterPathStroker pathStroker;
+    pathStroker.setJoinStyle(pen.joinStyle());
+    pathStroker.setDashOffset(pen.dashOffset());
+    pathStroker.setMiterLimit(pen.miterLimit());
+    pathStroker.setCapStyle(pen.capStyle());
+    pathStroker.setWidth(pen.widthF());
 
     if (hasShadow()) {
@@ -550 +563 @@
                     QBrush brush(*m_state.strokeGradient->platformGradient());
                     brush.setTransform(m_state.strokeGradient->gradientSpaceTransform());
-                    QPen shadowPen(pen);
-                    shadowPen.setBrush(brush);
-                    shadowPainter->strokePath(platformPath, shadowPen);
-                } else {
-                    shadowPainter->strokePath(platformPath, pen);
-                }
+                    fillPathStroke(shadowPainter, pathStroker, platformPath, brush);
+                } else
+                    fillPathStroke(shadowPainter, pathStroker, platformPath, pen.brush());
                 shadow->endShadowLayer(this);
             }
@@ -565 +575 @@
             QPen shadowPen(pen);
             shadowPen.setColor(shadowColor);
-            p->strokePath(platformPath, shadowPen);
+            fillPathStroke(p, pathStroker, platformPath, shadowPen.brush());
             p->translate(-offset);
         }
@@ -572 +582 @@
     if (m_state.strokePattern) {
         AffineTransform affine;
-        pen.setBrush(QBrush(m_state.strokePattern->createPlatformPattern(affine)));
-        p->setPen(pen);
-        p->strokePath(platformPath, pen);
+        QBrush brush = m_state.strokePattern->createPlatformPattern(affine);
+        fillPathStroke(p, pathStroker, platformPath, brush);
     } else if (m_state.strokeGradient) {
         QBrush brush(*m_state.strokeGradient->platformGradient());
         brush.setTransform(m_state.strokeGradient->gradientSpaceTransform());
-        pen.setBrush(brush);
-        p->setPen(pen);
-        p->strokePath(platformPath, pen);
+        fillPathStroke(p, pathStroker, platformPath, brush);
     } else
-        p->strokePath(platformPath, pen);
+        fillPathStroke(p, pathStroker, platformPath, pen.brush());
 }