commit 9e779d495130009926fc5394a8971eec20494e5f
author reed <reed@chromium.org> Tue Feb 17 11:43:14 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Feb 17 11:43:14 2015 -0800
tree 955249f142a0888c05cdeeaeaa01b3d0be759dbd
parent 305a8897cd03612b7d087c37526a9d953723fa34

add gm for path-arcs, and catch degenerate arc in conic-case

BUG=skia:3428

Review URL: https://codereview.chromium.org/931183002

src/core/SkPath.cpp

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 461ab3a..de3d297 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -934,14 +934,23 @@
     return SkBuildQuadArc(start, stop, dir, &matrix, pts);
 }
 #else
+/**
+ *  If this returns 0, then the caller should just line-to the singlePt, else it should
+ *  ignore singlePt and append the specified number of conics.
+ */
 static int build_arc_conics(const SkRect& oval, const SkVector& start, const SkVector& stop,
-                            SkRotationDirection dir, SkConic conics[SkConic::kMaxConicsForArc]) {
+                            SkRotationDirection dir, SkConic conics[SkConic::kMaxConicsForArc],
+                            SkPoint* singlePt) {
     SkMatrix    matrix;
 
     matrix.setScale(SkScalarHalf(oval.width()), SkScalarHalf(oval.height()));
     matrix.postTranslate(oval.centerX(), oval.centerY());
 
-    return SkConic::BuildUnitArc(start, stop, dir, &matrix, conics);
+    int count = SkConic::BuildUnitArc(start, stop, dir, &matrix, conics);
+    if (0 == count) {
+        matrix.mapXY(start.x(), start.y(), singlePt);
+    }
+    return count;
 }
 #endif
 
@@ -1176,8 +1185,9 @@
         this->quadTo(pts[i], pts[i+1]);
     }
 #else
+    SkPoint singlePt;
     SkConic conics[SkConic::kMaxConicsForArc];
-    int count = build_arc_conics(oval, startV, stopV, dir, conics);
+    int count = build_arc_conics(oval, startV, stopV, dir, conics, &singlePt);
     if (count) {
         this->incReserve(count * 2 + 1);
         const SkPoint& pt = conics[0].fPts[0];
@@ -1185,6 +1195,8 @@
         for (int i = 0; i < count; ++i) {
             this->conicTo(conics[i].fPts[1], conics[i].fPts[2], conics[i].fW);
         }
+    } else {
+        forceMoveTo ? this->moveTo(singlePt) : this->lineTo(singlePt);
     }
 #endif
 }