Fix bug where SkPath will convert an arc to an oval and change the starting point.

tests/PathTest.cpp

Index: tests/PathTest.cpp
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 36e93074ef4b59c66d2ceb45094ca0aa7272a3dc..3350e80e3f49e891fa13b9240d0f26bdc00364be 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include <cmath>
 #include "SkCanvas.h"
 #include "SkGeometry.h"
 #include "SkPaint.h"
@@ -3306,12 +3307,12 @@ static void test_arc(skiatest::Reporter* reporter) {
     p.reset();
     SkPath cwOval;
     cwOval.addOval(oval);
-    p.addArc(oval, 1, 360);
+    p.addArc(oval, 0, 360);
     REPORTER_ASSERT(reporter, p == cwOval);
     p.reset();
     SkPath ccwOval;
     ccwOval.addOval(oval, SkPath::kCCW_Direction);
-    p.addArc(oval, 1, -360);
+    p.addArc(oval, 0, -360);
     REPORTER_ASSERT(reporter, p == ccwOval);
     p.reset();
     p.addArc(oval, 1, 180);
@@ -3321,6 +3322,78 @@ static void test_arc(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, p.isConvex());
 }
 
+static inline SkScalar oval_start_index_to_angle(unsigned start) {
+    switch (start) {
+        case 0:
+            return 270.f;
+        case 1:
+            return 0.f;
+        case 2:
+            return 90.f;
+        case 3:
+            return 180.f;
+        default:
+            return -1.f;
+    }
+}
+
+static inline SkScalar canonical_start_angle(float angle) {
+    while (angle < 0.f) {
+        angle += 360.f;
+    }
+    while (angle >= 360.f) {
+        angle -= 360.f;
+    }
+    return angle;
+}
+
+static void test_arc_ovals(skiatest::Reporter* reporter) {
+    SkRect oval = SkRect::MakeWH(10, 20);
+    for (SkScalar sweep : {-720.f, -540.f, -360.f, 360.f, 432.f, 720.f}) {
+        for (SkScalar start = -360.f; start <= 360.f; start += 1.f) {
+            SkPath path;
+            path.addArc(oval, start, sweep);
+            SkRect r = SkRect::MakeEmpty();
+            SkPath::Direction d = SkPath::kCCW_Direction;
+            unsigned s = ~0U;
+            bool isOval = path.isOval(&r, &d, &s);
+            // SkPath's interfaces for inserting and extracting ovals only allow contours
+            // to start at multiples of 90 degrees.
+            if (std::fmod(start, 90.f) == 0) {
+                REPORTER_ASSERT(reporter, isOval);
+                SkPath recreatedPath;
+                recreatedPath.addOval(r, d, s);
+                REPORTER_ASSERT(reporter, path == recreatedPath);
+                REPORTER_ASSERT(reporter, oval_start_index_to_angle(s) ==
+                                          canonical_start_angle(start));
+                REPORTER_ASSERT(reporter, (SkPath::kCW_Direction == d) ==
+                                          (sweep > 0.f));
+            } else {
+                REPORTER_ASSERT(reporter, !isOval);
+            }
+        }
+        // Test start angles that are nearly at valid oval start angles.
+        for (float start : {-180.f, -90.f, 90.f, 180.f}) {
+            for (float delta : {-SK_ScalarNearlyZero, SK_ScalarNearlyZero}) {

[robertphillips, 2016/05/27 15:24:59]

Can we have a shared check_oval helper that takes and betterBeAnOval boolean?

[bsalomon, 2016/06/10 15:04:33]

Done.

+                SkPath path;
+                path.addArc(oval, start + delta, sweep);
+                SkRect r = SkRect::MakeEmpty();
+                SkPath::Direction d = SkPath::kCCW_Direction;
+                unsigned s = ~0U;
+                bool isOval = path.isOval(&r, &d, &s);
+                REPORTER_ASSERT(reporter, isOval);
+                SkPath recreatedPath;
+                recreatedPath.addOval(r, d, s);
+                REPORTER_ASSERT(reporter, path == recreatedPath);
+                REPORTER_ASSERT(reporter, oval_start_index_to_angle(s) ==
+                                          canonical_start_angle(start));
+                REPORTER_ASSERT(reporter, (SkPath::kCW_Direction == d) ==
+                                          (sweep > 0.f));
+            }
+        }
+    }
+}
+
 static void check_move(skiatest::Reporter* reporter, SkPath::RawIter* iter,
                        SkScalar x0, SkScalar y0) {
     SkPoint pts[4];
@@ -4121,6 +4194,7 @@ DEF_TEST(Paths, reporter) {
     test_path_to_region(reporter);
     test_rrect(reporter);
     test_arc(reporter);
+    test_arc_ovals(reporter);
     test_arcTo(reporter);
     test_addPath(reporter);
     test_addPathMode(reporter, false, false);