Add support for new canvas ellipse method.

Source/core/html/canvas/CanvasPathMethods.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  * Copyright (C) 2012, 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 112 matching lines @@
     FloatPoint p2 = FloatPoint(x2, y2);
 
     if (!m_path.hasCurrentPoint())
         m_path.moveTo(p1);
     else if (p1 == m_path.currentPoint() || p1 == p2 || !r)
         lineTo(x1, y1);
     else
         m_path.addArcTo(p1, p2, r);
 }
 
+static float adjustEndAngle(float sa, float ea, bool anticlockwise)
+{
+    // If 'sa' and 'ea' differ by more than 2Pi, just add a circle starting/ending at 'sa'.
+    if (anticlockwise && sa - ea >= 2 * piFloat)
+        return sa - 2 * piFloat;

[Stephen Chennney, 2013/04/26 14:51:03]

This is not correct. If they differ by more than 4 pi you will fail. The right
way to do this is with a while loop.

And what about cases where you are told to go anticlockwise and the angle is
less than -2 pi (or negative at all?).

[Stephen Chennney, 2013/04/26 14:57:56]

I see, it is correct according to the spec. But then you know you have a
complete ellipse, so it should be optimizable somehow.

+    if (!anticlockwise && ea - sa >= 2 * piFloat)
+        return sa + 2 * piFloat;
+    return ea;
+}
+
 void CanvasPathMethods::arc(float x, float y, float r, float sa, float ea, bool anticlockwise, ExceptionCode& ec)
 {
     ec = 0;
     if (!std::isfinite(x) || !std::isfinite(y) || !std::isfinite(r) || !std::isfinite(sa) || !std::isfinite(ea))
         return;
 
     if (r < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
 
     if (!r || sa == ea) {
         // The arc is empty but we still need to draw the connecting line.
         lineTo(x + r * cosf(sa), y + r * sinf(sa));
         return;
     }
 
     if (!isTransformInvertible())
         return;
 
-    // If 'sa' and 'ea' differ by more than 2Pi, just add a circle starting/ending at 'sa'.
-    if (anticlockwise && sa - ea >= 2 * piFloat) {
-        m_path.addArc(FloatPoint(x, y), r, sa, sa - 2 * piFloat, anticlockwise);
+    float adjustedEndAngle = adjustEndAngle(sa, ea, anticlockwise);
+    m_path.addArc(FloatPoint(x, y), r, sa, adjustedEndAngle, anticlockwise);
+}
+
+void CanvasPathMethods::ellipse(float x, float y, float rx, float ry, float rot, float sa, float ea, bool anticlockwise, ExceptionCode& ec)
+{
+    ec = 0;
+    if (!std::isfinite(x) || !std::isfinite(y) || !std::isfinite(rx) || !std::isfinite(ry) || !std::isfinite(rot) || !std::isfinite(sa) || !std::isfinite(ea))
         return;
-    }
-    if (!anticlockwise && ea - sa >= 2 * piFloat) {
-        m_path.addArc(FloatPoint(x, y), r, sa, sa + 2 * piFloat, anticlockwise);
+
+    if (rx < 0 || ry < 0) {
+        ec = INDEX_SIZE_ERR;
         return;
     }
 
-    m_path.addArc(FloatPoint(x, y), r, sa, ea, anticlockwise);
+    if (!rx || !ry || sa == ea) {
+        // The ellipse is empty but we still need to draw the connecting line to start point.
+        lineTo(x + rx * cosf(sa + rot), y + rx * sinf(sa + rot));
+        return;
+    }
+
+    if (!isTransformInvertible())
+        return;
+
+    float adjustedEndAngle = adjustEndAngle(sa, ea, anticlockwise);
+    m_path.addEllipse(FloatPoint(x, y), rx, ry, rot, sa, adjustedEndAngle, anticlockwise);

[Stephen Chennney, 2013/04/26 14:51:03]

You should catch the common case of an entire ellipse, and use the optimized
path for that.

[dshwang, 2013/04/26 15:23:33]

Thank you for review, Stephen. Yes, your opinion is great.
However, without CanvasPathMethods::ellipse, adjustEndAngle() is just extracted
from CanvasPathMethods::arc(). I mean that CanvasPathMethods::arc() behavior is
not changed. And your opinion is possible to apply arc() also. How about
separating optimization patch for both arc() and ellipse()?

If you say ok, I'll file it.

[Stephen Chennney, 2013/04/26 16:02:04]

You can certainly change both ellipse and arc. I'm not certain that it will
behave correctly due to possible differences in Skia behavior, but I would
certainly like you to try. We are actively attempting to use Skia optimized
primitives whenever we can.

 }
 
+
+
 void CanvasPathMethods::rect(float x, float y, float width, float height)
 {
     if (!isTransformInvertible())
         return;
 
     if (!std::isfinite(x) || !std::isfinite(y) || !std::isfinite(width) || !std::isfinite(height))
         return;
 
     if (!width && !height) {
         m_path.moveTo(FloatPoint(x, y));
         return;
     }
 
     m_path.addRect(FloatRect(x, y, width, height));
 }
 }