Changeset 28944 in webkit

Timestamp:

Dec 21, 2007 5:01:24 PM (16 years ago)

Author:

alp@webkit.org

Message:

2007-12-21 Brent Fulgham <​bfulgham@gmail.com>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=16558
Cairo WebCore Rendering Fails on arc drawing

Fix for bug reported (and patched) by Apollo team in which
arcs were draw in reverse (resulting in inverted images).
Review of the source found that the 'clockwise' term was
actually meant to mean 'anticlockwise' so the IDL and
supporting classes have been changed to match this.

• html/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::arc):
• html/CanvasRenderingContext2D.idl:
• platform/graphics/cairo/PathCairo.cpp: (WebCore::Path::addArc): (WebCore::Path::addEllipse):
• platform/graphics/Path.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/CanvasRenderingContext2D.cpp (modified) (2 diffs)
• html/CanvasRenderingContext2D.idl (modified) (1 diff)
• platform/graphics/Path.h (modified) (1 diff)
• platform/graphics/cairo/PathCairo.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-21  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16558
+        Cairo WebCore Rendering Fails on arc drawing
+
+        Fix for bug reported (and patched) by Apollo team in which
+        arcs were draw in reverse (resulting in inverted images).
+        Review of the source found that the 'clockwise' term was
+        actually meant to mean 'anticlockwise' so the IDL and
+        supporting classes have been changed to match this. 
+
+        * html/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::arc):
+        * html/CanvasRenderingContext2D.idl:
+        * platform/graphics/cairo/PathCairo.cpp:
+        (WebCore::Path::addArc):
+        (WebCore::Path::addEllipse):
+        * platform/graphics/Path.h:
+
 2007-12-21  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/html/CanvasRenderingContext2D.cpp

@@ -420 +420 @@
 }
 
-void CanvasRenderingContext2D::arc(float x, float y, float r, float sa, float ea, bool clockwise, ExceptionCode& ec)
+void CanvasRenderingContext2D::arc(float x, float y, float r, float sa, float ea, bool anticlockwise, ExceptionCode& ec)
 {
     ec = 0;
@@ -427 +427 @@
         return;
     }
-    state().m_path.addArc(FloatPoint(x, y), r, sa, ea, clockwise);
+    state().m_path.addArc(FloatPoint(x, y), r, sa, ea, anticlockwise);
 }
 

trunk/WebCore/html/CanvasRenderingContext2D.idl

@@ -73 +73 @@
         void rect(in float x, in float y, in float width, in float height)
             raises (DOMException);
-        void arc(in float x, in float y, in float radius, in float startAngle, in float endAngle, in boolean clockwise)
+        void arc(in float x, in float y, in float radius, in float startAngle, in float endAngle, in boolean anticlockwise)
             raises (DOMException);
         void fill();

trunk/WebCore/platform/graphics/Path.h

@@ -98 +98 @@
         void closeSubpath();
 
-        void addArc(const FloatPoint&, float radius, float startAngle, float endAngle, bool clockwise);
+        void addArc(const FloatPoint&, float radius, float startAngle, float endAngle, bool anticlockwise);
         void addRect(const FloatRect&);
         void addEllipse(const FloatRect&);

trunk/WebCore/platform/graphics/cairo/PathCairo.cpp

@@ -33 +33 @@
 #include <cairo.h>
 #include <math.h>
+#include <wtf/MathExtras.h>
 
 namespace WebCore {
@@ -137 +138 @@
 }
 
-void Path::addArc(const FloatPoint& p, float r, float sa, float ea, bool clockwise)
+void Path::addArc(const FloatPoint& p, float r, float sa, float ea, bool anticlockwise)
 {
     // http://bugs.webkit.org/show_bug.cgi?id=16449
@@ -145 +146 @@
 
     cairo_t* cr = platformPath()->m_cr;
-    if (clockwise)
+    if (anticlockwise)
+        cairo_arc_negative(cr, p.x(), p.y(), r, sa, ea);
+    else
         cairo_arc(cr, p.x(), p.y(), r, sa, ea);
-    else
-        cairo_arc_negative(cr, p.x(), p.y(), r, sa, ea);
 }
 
@@ -166 +167 @@
     cairo_translate(cr, rect.x() + xRadius, rect.y() + yRadius);
     cairo_scale(cr, xRadius, yRadius);
-    cairo_arc(cr, 0., 0., 1., 0., 2 * M_PI);
+    cairo_arc(cr, 0., 0., 1., 0., 2 * piDouble);
     cairo_restore(cr);
 }