fix bug introduced with SK_IGNORE_CUBIC_STROKE_FIX where we no longer respected

src/core/SkStroke.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkStrokerPriv.h"
 #include "SkGeometry.h"
 #include "SkPath.h"
 
 #define kMaxQuadSubdivide   5
-#define kMaxCubicSubdivide  4
+#define kMaxCubicSubdivide  7
 
 static inline bool degenerate_vector(const SkVector& v) {
     return !SkPoint::CanNormalize(v.fX, v.fY);
 }
 
 static inline bool normals_too_curvy(const SkVector& norm0, SkVector& norm1) {
     /*  root2/2 is a 45-degree angle
         make this constant bigger for more subdivisions (but not >= 1)
     */
     static const SkScalar kFlatEnoughNormalDotProd =
@@ skipping 273 matching lines @@
         cd = pts[3] - pts[1];
         degenerateCD = degenerate_vector(cd);
     }
     if (degenerateAB || degenerateCD) {
         goto DRAW_LINE;
     }
     SkAssertResult(set_normal_unitnormal(cd, fRadius, normalCD, unitNormalCD));
     bool degenerateBC = !set_normal_unitnormal(pts[1], pts[2], fRadius,
                                                &normalBC, &unitNormalBC);
 #ifndef SK_IGNORE_CUBIC_STROKE_FIX
-    if (subDivide <= 0) {
-        if (degenerateBC) {
-            goto DRAW_LINE;
-        } else {
-            goto DRAW_CUBIC;
-        }
+    if (--subDivide < 0) {
+        goto DRAW_LINE;
     }
 #endif
     if (degenerateBC || normals_too_curvy(unitNormalAB, unitNormalBC) ||
              normals_too_curvy(unitNormalBC, *unitNormalCD)) {
 #ifdef SK_IGNORE_CUBIC_STROKE_FIX
         // subdivide if we can
         if (--subDivide < 0) {
             goto DRAW_LINE;
         }
 #endif
         SkPoint     tmp[7];
         SkVector    norm, unit, dummy, unitDummy;
 
         SkChopCubicAtHalf(pts, tmp);
         this->cubic_to(&tmp[0], normalAB, unitNormalAB, &norm, &unit,
                        subDivide);
         // we use dummys since we already have a valid (and more accurate)
         // normals for CD
         this->cubic_to(&tmp[3], norm, unit, &dummy, &unitDummy, subDivide);
     } else {
-#ifndef SK_IGNORE_CUBIC_STROKE_FIX
-    DRAW_CUBIC:
-#endif
         SkVector    normalB, normalC;
 
         // need normals to inset/outset the off-curve pts B and C
 
         SkVector    unitBC = pts[2] - pts[1];
         unitBC.normalize();
         unitBC.rotateCCW();
 
         normalB = unitNormalAB + unitBC;
         normalC = *unitNormalCD + unitBC;
@@ skipping 418 matching lines @@
         default:
             break;
     }
 
     if (fWidth < SkMinScalar(rw, rh) && !fDoFill) {
         r = rect;
         r.inset(radius, radius);
         dst->addRect(r, reverse_direction(dir));
     }
 }