Index: src/gpu/GrContext.cpp |
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp |
index b2a1f5b6337ab473d89d98a6e49ae92d7cf7791c..819774a076a88b657f270dd7bc171a4a4908aaa6 100755 |
--- a/src/gpu/GrContext.cpp |
+++ b/src/gpu/GrContext.cpp |
@@ -1325,14 +1325,13 @@ |
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; |
- } |
- strokeInfoPtr = &dashlessStrokeInfo; |
+ if (strokeInfo.applyDash(tmpPath.init(), &dashlessStrokeInfo, *pathPtr)) { |
+ pathPtr = tmpPath.get(); |
+ if (pathPtr->isEmpty()) { |
+ return; |
+ } |
+ strokeInfoPtr = &dashlessStrokeInfo; |
+ } |
pr = this->getPathRenderer(target, pipelineBuilder, viewMatrix, *pathPtr, *strokeInfoPtr, |
false, type); |
} |
@@ -1345,15 +1344,14 @@ |
} |
SkStrokeRec* strokeRec = dashlessStrokeInfo.getStrokeRecPtr(); |
strokeRec->setResScale(SkScalarAbs(viewMatrix.getMaxScale())); |
- if (!strokeRec->applyToPath(tmpPath.get(), *pathPtr)) { |
- return; |
+ if (strokeRec->applyToPath(tmpPath.get(), *pathPtr)) { |
+ pathPtr = tmpPath.get(); |
+ if (pathPtr->isEmpty()) { |
+ return; |
+ } |
+ strokeRec->setFillStyle(); |
+ strokeInfoPtr = &dashlessStrokeInfo; |
} |
- pathPtr = tmpPath.get(); |
- if (pathPtr->isEmpty()) { |
- return; |
- } |
- strokeRec->setFillStyle(); |
- strokeInfoPtr = &dashlessStrokeInfo; |
} |
// This time, allow SW renderer |