| Index: src/gpu/GrDrawContext.cpp
|
| diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
|
| index 263f0c8dddff3144fc0efa308b6759ec7b89b2f6..aee3d084c3907a73dfcca6992bb4b83833794ad8 100644
|
| --- a/src/gpu/GrDrawContext.cpp
|
| +++ b/src/gpu/GrDrawContext.cpp
|
| @@ -407,7 +407,7 @@ void GrDrawContextPriv::stencilRect(const GrFixedClip& clip,
|
|
|
| GrPaint paint;
|
| paint.setAntiAlias(doAA);
|
| - SkSafeUnref(paint.setXPFactory(GrDisableColorXPFactory::Create()));
|
| + paint.setXPFactory(GrDisableColorXPFactory::Create());
|
|
|
| SkAutoTUnref<GrDrawBatch> batch(fDrawContext->getFillRectBatch(paint, viewMatrix, rect));
|
| SkASSERT(batch);
|
| @@ -651,18 +651,18 @@ bool GrDrawContext::drawFilledDRRect(const GrClip& clip,
|
| grPaint.setAntiAlias(false);
|
|
|
| // TODO these need to be a geometry processors
|
| - SkAutoTUnref<GrFragmentProcessor> innerEffect(GrRRectEffect::Create(innerEdgeType, *inner));
|
| + sk_sp<GrFragmentProcessor> innerEffect(GrRRectEffect::Make(innerEdgeType, *inner));
|
| if (!innerEffect) {
|
| return false;
|
| }
|
|
|
| - SkAutoTUnref<GrFragmentProcessor> outerEffect(GrRRectEffect::Create(outerEdgeType, *outer));
|
| + sk_sp<GrFragmentProcessor> outerEffect(GrRRectEffect::Make(outerEdgeType, *outer));
|
| if (!outerEffect) {
|
| return false;
|
| }
|
|
|
| - grPaint.addCoverageFragmentProcessor(innerEffect);
|
| - grPaint.addCoverageFragmentProcessor(outerEffect);
|
| + grPaint.addCoverageFragmentProcessor(std::move(innerEffect));
|
| + grPaint.addCoverageFragmentProcessor(std::move(outerEffect));
|
|
|
| SkRect bounds = outer->getBounds();
|
| if (applyAA) {
|
|
|