commit 24f19780d1e76595c049d8cad4352de839cfc6b5
author Brian Salomon <bsalomon@google.com> Tue Dec 13 15:10:11 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 13 20:48:50 2016 +0000
tree 43caf0b20dddaf2687451ae0f8096bfc639dbda2
parent d5aabd6744b64e2bfc48b4dec2311ce58e6f9225

Make GrRenderTargetContext::addDrawOp use sk_sp

Change-Id: Iff7f63635cdbc5cc51e5968a565f2fde2be3acb0
Reviewed-on: https://skia-review.googlesource.com/5932
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/text/GrAtlasTextBlob.cpp

diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp
index 1fb4f2c..c5fa86f 100644
--- a/src/gpu/text/GrAtlasTextBlob.cpp
+++ b/src/gpu/text/GrAtlasTextBlob.cpp
@@ -317,15 +317,12 @@
 
         GrColor color = grPaint.getColor();
 
-        sk_sp<GrDrawOp> batch(this->createBatch(info, glyphCount, run,
-                                                subRun, viewMatrix, x, y, color,
-                                                skPaint, props,
-                                                distanceAdjustTable,
-                                                rtc->isGammaCorrect(),
-                                                cache));
+        sk_sp<GrDrawOp> op(this->createBatch(info, glyphCount, run, subRun, viewMatrix, x, y, color,
+                                             skPaint, props, distanceAdjustTable,
+                                             rtc->isGammaCorrect(), cache));
         GrPipelineBuilder pipelineBuilder(grPaint, GrAAType::kNone);
 
-        rtc->addDrawOp(pipelineBuilder, clip, batch.get());
+        rtc->addDrawOp(pipelineBuilder, clip, std::move(op));
     }
 }