diff options
Diffstat (limited to 'src/gpu/GrContext.cpp')
| -rwxr-xr-x | src/gpu/GrContext.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index b2a1f5b633..819774a076 100755 --- 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 |