Changeset 59767 in webkit

Timestamp:

May 19, 2010 8:55:12 AM (14 years ago)

Author:

chang.shu@nokia.com

Message:

2010-05-19 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

[Qt] REGRESSION: CoolClock isn't rendered properly

​https://bugs.webkit.org/show_bug.cgi?id=38526

CanvasRenderingContext2D's arc() should connect to the previous point
with a straight line (HTML5 spec 4.8.11.1.8), but if the path is empty
to begin with, we don't want a line back to (0,0)
This also fixes the rendering artifact discussed in bug 36226.

Spec link:
​http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-arc

Test: fast/canvas/canvas-arc-connecting-line.html

• platform/graphics/qt/PathQt.cpp: (WebCore::Path::addArc):

2010-05-19 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

Add test to verify that CanvasRenderingContext2D's arc() connects arcs
by a straight line (unless it's the first element in the path.)
​https://bugs.webkit.org/show_bug.cgi?id=38526

• fast/canvas/canvas-arc-connecting-line-expected.txt: Added.
• fast/canvas/canvas-arc-connecting-line.html: Added.
• fast/canvas/script-tests/canvas-arc-connecting-line.js: Added. (deg2rad):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-arc-connecting-line-expected.txt (added)
• LayoutTests/fast/canvas/canvas-arc-connecting-line.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-arc-connecting-line.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/PathQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-05-19  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Add test to verify that CanvasRenderingContext2D's arc() connects arcs
+        by a straight line (unless it's the first element in the path.)
+        https://bugs.webkit.org/show_bug.cgi?id=38526
+
+        * fast/canvas/canvas-arc-connecting-line-expected.txt: Added.
+        * fast/canvas/canvas-arc-connecting-line.html: Added.
+        * fast/canvas/script-tests/canvas-arc-connecting-line.js: Added.
+        (deg2rad):
+
 2010-05-19  Peter Varga  <pvarga@inf.u-szeged.hu>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-19  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] REGRESSION: CoolClock isn't rendered properly
+
+        https://bugs.webkit.org/show_bug.cgi?id=38526
+
+        CanvasRenderingContext2D's arc() should connect to the previous point
+        with a straight line (HTML5 spec 4.8.11.1.8), but if the path is empty
+        to begin with, we don't want a line back to (0,0)
+        This also fixes the rendering artifact discussed in bug 36226.
+
+        Spec link:
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-arc
+
+        Test: fast/canvas/canvas-arc-connecting-line.html
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::addArc):
+
 2010-05-19  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -299 +299 @@
     }
 
-    // connect to the previous point by a straight line
-    m_path.lineTo(QPointF(xc + radius  * cos(sar),
-                          yc - radius  * sin(sar)));
+    // If the path is empty, move to where the arc will start to avoid painting a line from (0,0)
+    // NOTE: QPainterPath::isEmpty() won't work here since it ignores a lone MoveToElement
+    if (!m_path.elementCount())
+        m_path.arcMoveTo(xs, ys, width, height, sa);
 
     m_path.arcTo(xs, ys, width, height, sa, span);