| Index: src/gpu/batches/GrMSAAPathRenderer.cpp
|
| diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp
|
| index 8b1319b68208ef5f008d9dd2d700ed0481b1be3a..2072175ef5ff55462f4b38dae6eec70581ee9c17 100644
|
| --- a/src/gpu/batches/GrMSAAPathRenderer.cpp
|
| +++ b/src/gpu/batches/GrMSAAPathRenderer.cpp
|
| @@ -568,6 +568,7 @@ private:
|
|
|
| bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target,
|
| GrPipelineBuilder* pipelineBuilder,
|
| + const GrClip& clip,
|
| GrColor color,
|
| const SkMatrix& viewMatrix,
|
| const SkPath& path,
|
| @@ -676,7 +677,7 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target,
|
| SkAutoTUnref<GrDrawBatch> batch(
|
| GrRectBatchFactory::CreateNonAAFill(color, viewM, bounds, nullptr,
|
| &localMatrix));
|
| - target->drawBatch(*pipelineBuilder, batch);
|
| + target->drawBatch(*pipelineBuilder, clip, batch);
|
| } else {
|
| if (passCount > 1) {
|
| pipelineBuilder->setDisableColorXPFactory();
|
| @@ -690,7 +691,7 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawTarget* target,
|
| SkAutoTUnref<MSAAPathBatch> batch(MSAAPathBatch::Create(geometry, viewMatrix,
|
| devBounds));
|
| if (batch->isValid()) {
|
| - target->drawBatch(*pipelineBuilder, batch);
|
| + target->drawBatch(*pipelineBuilder, clip, batch);
|
| }
|
| else {
|
| return false;
|
| @@ -728,6 +729,7 @@ bool GrMSAAPathRenderer::onDrawPath(const DrawPathArgs& args) {
|
| }
|
| return this->internalDrawPath(args.fTarget,
|
| args.fPipelineBuilder,
|
| + *args.fClip,
|
| args.fColor,
|
| *args.fViewMatrix,
|
| *path,
|
| @@ -738,8 +740,8 @@ void GrMSAAPathRenderer::onStencilPath(const StencilPathArgs& args) {
|
| GR_AUDIT_TRAIL_AUTO_FRAME(args.fTarget->getAuditTrail(),"GrMSAAPathRenderer::onStencilPath");
|
| SkASSERT(SkPath::kInverseEvenOdd_FillType != args.fPath->getFillType());
|
| SkASSERT(SkPath::kInverseWinding_FillType != args.fPath->getFillType());
|
| - this->internalDrawPath(args.fTarget, args.fPipelineBuilder, GrColor_WHITE, *args.fViewMatrix,
|
| - *args.fPath, true);
|
| + this->internalDrawPath(args.fTarget, args.fPipelineBuilder, *args.fClip, GrColor_WHITE,
|
| + *args.fViewMatrix, *args.fPath, true);
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|