Fix issue where GrStyle::applyToPath exited before applying stroke

src/gpu/GrStyle.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 "GrStyle.h"
 
 int GrStyle::KeySize(const GrStyle &style, Apply apply, uint32_t flags) {
@@ skipping 119 matching lines @@
         return false;
     }
     *remainingStroke = strokeRec;
     return true;
 }
 
 bool GrStyle::applyToPath(SkPath* dst, SkStrokeRec::InitStyle* style, const SkPath& src) const {
     SkASSERT(style);
     SkASSERT(dst);
     SkStrokeRec strokeRec = fStrokeRec;
-    if (!apply_path_effect(dst, &strokeRec, fPathEffect, src)) {
+    const SkPath* pathForStrokeRec = &src;
+    if (apply_path_effect(dst, &strokeRec, fPathEffect, src)) {
+        pathForStrokeRec = dst;
+    } else if (fPathEffect) {
         return false;
     }
     if (strokeRec.needToApply()) {
-        if (!strokeRec.applyToPath(dst, *dst)) {
+        if (!strokeRec.applyToPath(dst, *pathForStrokeRec)) {
             return false;
         }
         *style = SkStrokeRec::kFill_InitStyle;
+    } else if (!fPathEffect) {
+        // Nothing to do for path effect or stroke, fail.
+        return false;
     } else {
         SkASSERT(SkStrokeRec::kFill_Style == strokeRec.getStyle() ||
                  SkStrokeRec::kHairline_Style == strokeRec.getStyle());
         *style = strokeRec.getStyle() == SkStrokeRec::kFill_Style
                  ? SkStrokeRec::kFill_InitStyle
                  : SkStrokeRec::kHairline_InitStyle;
     }
     return true;
 }