| Index: src/gpu/GrDrawContext.cpp
|
| diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
|
| index 2f78d1e4f6c782b4af4a42f20a53dd3ce43beecb..64ce0cec3134295cc3b4f5fca5a1e1ba789423ed 100644
|
| --- a/src/gpu/GrDrawContext.cpp
|
| +++ b/src/gpu/GrDrawContext.cpp
|
| @@ -420,7 +420,7 @@ void GrDrawContextPriv::stencilRect(const GrFixedClip& clip,
|
|
|
| GrPaint paint;
|
| paint.setAntiAlias(doAA);
|
| - SkSafeUnref(paint.setXPFactory(GrDisableColorXPFactory::Create()));
|
| + paint.setXPFactory(GrDisableColorXPFactory::Make());
|
|
|
| bool useHWAA;
|
| SkAutoTUnref<GrDrawBatch> batch(
|
| @@ -671,18 +671,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) {
|
|
|