Revert of Don't attempt to draw path if dashing or stroking fails (patchset #1 id...

Reason for revert:
Doesn't draw

Original issue's description:
> Don't attempt to draw path if dashing or stroking fails
>
>
> TBR=egdaniel@google.com
>
> Committed: https://skia.googlesource.com/skia/+/39202f12d37b6ef69ffaddcaa8cc92c621fcda41

TBR=egdaniel@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1119423002

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index b2a1f5b6337ab473d89d98a6e49ae92d7cf7791c..819774a076a88b657f270dd7bc171a4a4908aaa6 100755 (executable)
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1325,14 +1325,13 @@ void GrContext::internalDrawPath(GrDrawTarget* target,
     GrStrokeInfo dashlessStrokeInfo(strokeInfo, false);
     if (NULL == pr && strokeInfo.isDashed()) {
         // It didn't work above, so try again with dashed stroke converted to a dashless stroke.
-        if (!strokeInfo.applyDash(tmpPath.init(), &dashlessStrokeInfo, *pathPtr)) {
-            return;
-        }
-        pathPtr = tmpPath.get();
-        if (pathPtr->isEmpty()) {
-            return;
+        if (strokeInfo.applyDash(tmpPath.init(), &dashlessStrokeInfo, *pathPtr)) {
+            pathPtr = tmpPath.get();
+            if (pathPtr->isEmpty()) {
+                return;
+            }
+            strokeInfoPtr = &dashlessStrokeInfo;
         }
-        strokeInfoPtr = &dashlessStrokeInfo;
         pr = this->getPathRenderer(target, pipelineBuilder, viewMatrix, *pathPtr, *strokeInfoPtr,
                                    false, type);
     }
@@ -1345,15 +1344,14 @@ void GrContext::internalDrawPath(GrDrawTarget* target,
             }
             SkStrokeRec* strokeRec = dashlessStrokeInfo.getStrokeRecPtr();
             strokeRec->setResScale(SkScalarAbs(viewMatrix.getMaxScale()));
-            if (!strokeRec->applyToPath(tmpPath.get(), *pathPtr)) {
-                return;
-            }
-            pathPtr = tmpPath.get();
-            if (pathPtr->isEmpty()) {
-                return;
+            if (strokeRec->applyToPath(tmpPath.get(), *pathPtr)) {
+                pathPtr = tmpPath.get();
+                if (pathPtr->isEmpty()) {
+                    return;
+                }
+                strokeRec->setFillStyle();
+                strokeInfoPtr = &dashlessStrokeInfo;
             }
-            strokeRec->setFillStyle();
-            strokeInfoPtr = &dashlessStrokeInfo;
         }
 
         // This time, allow SW renderer