Reland of more zero-length changes for svg compatibility

tests/EmptyPathTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "Test.h"
@@ skipping 36 matching lines @@
         }
         ERRORF(reporter, "%s style[%d] cap[%d] join[%d] antialias[%d]"
                " filltype[%d] ptcount[%d]", str, paint.getStyle(),
                paint.getStrokeCap(), paint.getStrokeJoin(),
                paint.isAntiAlias(), path.getFillType(), path.countPoints());
 // uncomment this if you want to step in to see the failure
 //        canvas.drawPath(path, p);
     }
 }
 
-static void iter_paint(skiatest::Reporter* reporter, const SkPath& path, bool shouldDraw) {
+enum DrawCaps {
+    kDontDrawCaps,
+    kDrawCaps
+};
+
+static void iter_paint(skiatest::Reporter* reporter, const SkPath& path, bool shouldDraw,
+                       DrawCaps drawCaps) {
     static const SkPaint::Cap gCaps[] = {
         SkPaint::kButt_Cap,
         SkPaint::kRound_Cap,
         SkPaint::kSquare_Cap
     };
     static const SkPaint::Join gJoins[] = {
         SkPaint::kMiter_Join,
         SkPaint::kRound_Join,
         SkPaint::kBevel_Join
     };
     static const SkPaint::Style gStyles[] = {
         SkPaint::kFill_Style,
         SkPaint::kStroke_Style,
         SkPaint::kStrokeAndFill_Style
     };
     for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
         for (size_t join = 0; join < SK_ARRAY_COUNT(gJoins); ++join) {
             for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
+                if (drawCaps && SkPaint::kButt_Cap != gCaps[cap]
+                        && SkPaint::kFill_Style != gStyles[style]) {
+                    continue;
+                }
+
                 SkPaint paint;
                 paint.setStrokeWidth(SkIntToScalar(10));
 
                 paint.setStrokeCap(gCaps[cap]);
                 paint.setStrokeJoin(gJoins[join]);
                 paint.setStyle(gStyles[style]);
 
                 paint.setAntiAlias(false);
                 drawAndTest(reporter, path, paint, shouldDraw);
                 paint.setAntiAlias(true);
@@ skipping 34 matching lines @@
         SkPath::kInverseWinding_FillType,
         SkPath::kInverseEvenOdd_FillType
     };
     for (int doClose = 0; doClose < 2; ++doClose) {
         for  (size_t i = 0; i < SK_ARRAY_COUNT(gMakeProc); ++i) {
             SkPath path;
             gMakeProc[i](&path);
             if (doClose) {
                 path.close();
             }
+            /* zero length segments and close following moves draw round and square caps */
+            bool allowCaps = make_L == gMakeProc[i] || make_Q == gMakeProc[i]
+                    || make_C == gMakeProc[i] || make_MZM == gMakeProc[i];
+            allowCaps |= SkToBool(doClose);
             for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
                 path.setFillType(gFills[fill]);
                 bool shouldDraw = path.isInverseFillType();
-                iter_paint(reporter, path, shouldDraw);
+                iter_paint(reporter, path, shouldDraw, allowCaps ? kDrawCaps : kDontDrawCaps);
             }
         }
     }
 }
 
 DEF_TEST(EmptyPath, reporter) {
     test_emptydrawing(reporter);
 }