diff options
author | Brian Salomon <bsalomon@google.com> | 2017-06-15 09:59:23 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-15 16:49:40 +0000 |
commit | baaf439eb5d08097d794f13800e5bf7ce8885f95 (patch) | |
tree | 16c3edc2f01918e62fd58c7034d8885932452b67 /gm/rrects.cpp | |
parent | 1a0882e7ee9c7929f0079d3b335efb9a664f605b (diff) |
Revert "Revert "Converts remaining rect ops from GrLegacyMeshDrawOp to GrMeshDrawOp subclasses.""
This reverts commit a0485d94529905e76320b7aa941a0d94b5578ac2.
Bug: skia:
Change-Id: If50b2d1af285a6c3c943373bb7258b56e1af28d6
Reviewed-on: https://skia-review.googlesource.com/19961
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/rrects.cpp')
-rw-r--r-- | gm/rrects.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 23f576b5e9..3124895a49 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -12,7 +12,7 @@ #include "GrRenderTargetContextPriv.h" #include "effects/GrRRectEffect.h" #include "ops/GrDrawOp.h" -#include "ops/GrNonAAFillRectOp.h" +#include "ops/GrRectOpFactory.h" #endif #include "SkRRect.h" @@ -117,12 +117,9 @@ protected: bounds.outset(2.f, 2.f); renderTargetContext->priv().testingOnly_addDrawOp( - GrNonAAFillRectOp::Make(std::move(grPaint), - SkMatrix::I(), - bounds, - nullptr, - nullptr, - GrAAType::kNone)); + GrRectOpFactory::MakeNonAAFill(std::move(grPaint), + SkMatrix::I(), bounds, + GrAAType::kNone)); } else { drew = false; } |