diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 16:07:12 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 22:28:31 +0000 |
| commit | 1951f3ddbddcf5e7cdfe151981d13a1bdb6a3baa (patch) | |
| tree | e9cb370946328bb82ec98700be5f44b98ddc14d8 /gm/beziereffects.cpp | |
| parent | b0b17d1e5375a65b8956a8990d63e0d02357fdaf (diff) | |
Rename testingOnly_drawBatch to testingOnly_addDrawOp and sk_sp
Change-Id: I35efd4ad2b7132145c1e477f0b1f283276e9fad5
Reviewed-on: https://skia-review.googlesource.com/5704
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/beziereffects.cpp')
| -rw-r--r-- | gm/beziereffects.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 9a1990b383..73af7e45b8 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -192,11 +192,12 @@ protected: GrPaint grPaint; grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); - sk_sp<GrDrawOp> batch = sk_make_sp<BezierCubicOrConicTestBatch>( - gp, bounds, color, klmEqs, klmSigns[c]); + sk_sp<GrDrawOp> op = sk_make_sp<BezierCubicOrConicTestBatch>(gp, bounds, color, + klmEqs, + klmSigns[c]); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, - batch.get()); + renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone, + std::move(op)); } ++col; if (numCols == col) { @@ -325,11 +326,11 @@ protected: GrPaint grPaint; grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); - sk_sp<GrDrawOp> batch( - new BezierCubicOrConicTestBatch(gp, bounds, color, klmEqs, 1.f)); + sk_sp<GrDrawOp> op(new BezierCubicOrConicTestBatch(gp, bounds, color, klmEqs, + 1.f)); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, - batch.get()); + renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone, + std::move(op)); } ++col; if (numCols == col) { @@ -538,10 +539,10 @@ protected: GrPathUtils::QuadUVMatrix DevToUV(pts); - sk_sp<GrDrawOp> batch(new BezierQuadTestBatch(gp, bounds, color, DevToUV)); + sk_sp<GrDrawOp> op(new BezierQuadTestBatch(gp, bounds, color, DevToUV)); - renderTargetContext->priv().testingOnly_drawBatch(grPaint, GrAAType::kNone, - batch.get()); + renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone, + std::move(op)); } ++col; if (numCols == col) { |