Changeset 60663 in webkit

Timestamp:

Jun 4, 2010 1:20:50 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-04 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] failed at ​http://philip.html5.org/tests/canvas/suite/tests/2d.path.arc.angle.3.html
​https://bugs.webkit.org/show_bug.cgi?id=38537

Remove canvas/philip/tests/2d.path.arcTo.2d.path.arc.angle.3.html and
canvas/philip/tests/2d.path.arcTo.2d.path.arc.angle.5.html from Skipped.

• platform/qt/Skipped:

2010-06-04 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] failed at ​http://philip.html5.org/tests/canvas/suite/tests/2d.path.arc.angle.3.html
​https://bugs.webkit.org/show_bug.cgi?id=38537

For path.arc function handle span > 2PI

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/PathQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-04  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] failed at http://philip.html5.org/tests/canvas/suite/tests/2d.path.arc.angle.3.html
+        https://bugs.webkit.org/show_bug.cgi?id=38537
+
+        Remove canvas/philip/tests/2d.path.arcTo.2d.path.arc.angle.3.html and
+        canvas/philip/tests/2d.path.arcTo.2d.path.arc.angle.5.html from Skipped.
+
+        * platform/qt/Skipped:
+
 2010-06-04  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5136 +5136 @@
 canvas/philip/tests/2d.line.miter.lineedge.html
 canvas/philip/tests/2d.missingargs.html
-canvas/philip/tests/2d.path.arc.angle.3.html
-canvas/philip/tests/2d.path.arc.angle.5.html
 canvas/philip/tests/2d.path.arc.twopie.3.html
 canvas/philip/tests/2d.path.arc.zeroradius.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-04  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] failed at http://philip.html5.org/tests/canvas/suite/tests/2d.path.arc.angle.3.html
+        https://bugs.webkit.org/show_bug.cgi?id=38537
+
+        For path.arc function handle span > 2PI
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::addArc):
+
 2010-06-04  Zhenyao Mo  <zmo@google.com>
 

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

@@ -287 +287 @@
     double height = radius*2;
 
-    if (!anticlockwise && (ea < sa))
-        span += 360;
-    else if (anticlockwise && (sa < ea))
-        span -= 360;
-
-    // this is also due to switched coordinate system
-    // we would end up with a 0 span instead of 360
-    if (!(qFuzzyCompare(span + (ea - sa) + 1, 1.0) &&
-          qFuzzyCompare(qAbs(span), 360.0))) {
-        span += ea - sa;
+    if ((!anticlockwise && (ea - sa >= 360)) || (anticlockwise && (sa - ea >= 360)))
+        // If the anticlockwise argument is false and endAngle-startAngle is equal to or greater than 2*PI, or, if the
+        // anticlockwise argument is true and startAngle-endAngle is equal to or greater than 2*PI, then the arc is the whole
+        // circumference of this circle.
+        span = 360;
+    else {
+        if (!anticlockwise && (ea < sa))
+            span += 360;
+        else if (anticlockwise && (sa < ea))
+            span -= 360;
+
+        // this is also due to switched coordinate system
+        // we would end up with a 0 span instead of 360
+        if (!(qFuzzyCompare(span + (ea - sa) + 1, 1.0)
+            && qFuzzyCompare(qAbs(span), 360.0))) {
+            // mod 360
+            span += (ea - sa) - (static_cast<int>((ea - sa) / 360)) * 360;
+        }
     }