Fix issue where GrStyle::applyToPath exited before applying stroke

tests/GrShapeTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <initializer_list>
 #include <functional>
 #include "Test.h"
@@ skipping 70 matching lines @@
         fAppliedPEThenStroke.asPath(&a);
         fAppliedFull.asPath(&b);
         REPORTER_ASSERT(r, a == b);
 
         // Check that the same path is produced when style is applied by GrShape and GrStyle.
         SkPath preStyle;
         SkPath postPathEffect;
         SkPath postAllStyle;
 
         fBase.asPath(&preStyle);
-        SkStrokeRec postPathEffectStrokeRec(SkStrokeRec::kFill_InitStyle);
-        if (fBase.style().applyPathEffectToPath(&postPathEffect, &postPathEffectStrokeRec,
-                                                preStyle)) {
+        SkStrokeRec postPEStrokeRec(SkStrokeRec::kFill_InitStyle);
+        if (fBase.style().applyPathEffectToPath(&postPathEffect, &postPEStrokeRec, preStyle)) {
+            // run postPathEffect through GrShape to get any geometry reductions that would have
+            // occurred to fAppliedPE.
+            GrShape(postPathEffect, GrStyle(postPEStrokeRec, nullptr)).asPath(&postPathEffect);
+
             SkPath testPath;
             fAppliedPE.asPath(&testPath);
             REPORTER_ASSERT(r, testPath == postPathEffect);
-            REPORTER_ASSERT(r,
-                            postPathEffectStrokeRec.hasEqualEffect(fAppliedPE.style().strokeRec()));
+            REPORTER_ASSERT(r, postPEStrokeRec.hasEqualEffect(fAppliedPE.style().strokeRec()));
         }
         SkStrokeRec::InitStyle fillOrHairline;
         if (fBase.style().applyToPath(&postAllStyle, &fillOrHairline, preStyle)) {
+            // run postPathEffect through GrShape to get any reductions that would have occurred
+            // to fAppliedFull.
+            GrShape(postAllStyle, GrStyle(fillOrHairline)).asPath(&postAllStyle);
+
             SkPath testPath;
             fAppliedFull.asPath(&testPath);
             REPORTER_ASSERT(r, testPath == postAllStyle);
             if (fillOrHairline == SkStrokeRec::kFill_InitStyle) {
                 REPORTER_ASSERT(r, fAppliedFull.style().isSimpleFill());
             } else {
                 REPORTER_ASSERT(r, fAppliedFull.style().isSimpleHairline());
             }
         }
     }
@@ skipping 734 matching lines @@
         }
     }
 
     // Test a volatile empty path.
     test_volatile_path(reporter, SkPath(), true);
 
     test_empty_shape(reporter);
 }
 
 #endif