Fix issue where GrStyle::applyToPath exited before applying stroke

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1954123002

Review-Url: https://codereview.chromium.org/1954123002

1 files changed, 8 insertions, 2 deletions

diff --git a/src/gpu/GrStyle.cpp b/src/gpu/GrStyle.cpp
index 6480fb341a..68238dded9 100644
--- a/src/gpu/GrStyle.cpp
+++ b/src/gpu/GrStyle.cpp
@@ -137,14 +137,20 @@ bool GrStyle::applyToPath(SkPath* dst, SkStrokeRec::InitStyle* style, const SkPa
     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());