diff options
author | 2015-05-04 10:36:53 -0700 | |
---|---|---|
committer | 2015-05-04 10:36:53 -0700 | |
commit | 39202f12d37b6ef69ffaddcaa8cc92c621fcda41 (patch) | |
tree | 1195884fe03bf68885340ea5558351ed928c190a /src/gpu/GrContext.cpp | |
parent | ed0bcad9c8147fd37c23bdda00ec27ec9ef8d66b (diff) |
Don't attempt to draw path if dashing or stroking fails
TBR=egdaniel@google.com
Review URL: https://codereview.chromium.org/1119393002
Diffstat (limited to 'src/gpu/GrContext.cpp')
-rwxr-xr-x | src/gpu/GrContext.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 819774a076..b2a1f5b633 100755 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1325,13 +1325,14 @@ 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)) { - pathPtr = tmpPath.get(); - if (pathPtr->isEmpty()) { - return; - } - strokeInfoPtr = &dashlessStrokeInfo; + if (!strokeInfo.applyDash(tmpPath.init(), &dashlessStrokeInfo, *pathPtr)) { + return; + } + pathPtr = tmpPath.get(); + if (pathPtr->isEmpty()) { + return; } + strokeInfoPtr = &dashlessStrokeInfo; pr = this->getPathRenderer(target, pipelineBuilder, viewMatrix, *pathPtr, *strokeInfoPtr, false, type); } @@ -1344,14 +1345,15 @@ void GrContext::internalDrawPath(GrDrawTarget* target, } SkStrokeRec* strokeRec = dashlessStrokeInfo.getStrokeRecPtr(); strokeRec->setResScale(SkScalarAbs(viewMatrix.getMaxScale())); - if (strokeRec->applyToPath(tmpPath.get(), *pathPtr)) { - pathPtr = tmpPath.get(); - if (pathPtr->isEmpty()) { - return; - } - strokeRec->setFillStyle(); - strokeInfoPtr = &dashlessStrokeInfo; + if (!strokeRec->applyToPath(tmpPath.get(), *pathPtr)) { + return; + } + pathPtr = tmpPath.get(); + if (pathPtr->isEmpty()) { + return; } + strokeRec->setFillStyle(); + strokeInfoPtr = &dashlessStrokeInfo; } // This time, allow SW renderer |