Update rect ops to use "op" in their name and return sk_sp.
Change-Id: I757c33d1cd17a7a7dda858f0fc5ab1094e3c2472
Reviewed-on: https://skia-review.googlesource.com/5985
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index 168571c..ac96303 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -17,7 +17,7 @@
#include "SkGr.h"
#include "SkGradientShader.h"
#include "batches/GrDrawOp.h"
-#include "batches/GrRectBatchFactory.h"
+#include "batches/GrRectOpFactory.h"
#include "effects/GrYUVEffect.h"
#define YSIZE 8
@@ -123,9 +123,8 @@
SkMatrix viewMatrix;
viewMatrix.setTranslate(x, y);
grPaint.addColorFragmentProcessor(std::move(fp));
- sk_sp<GrDrawOp> op(
- GrRectBatchFactory::CreateNonAAFill(GrColor_WHITE, viewMatrix,
- renderRect, nullptr, nullptr));
+ sk_sp<GrDrawOp> op(GrRectOpFactory::MakeNonAAFill(
+ GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr));
renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone,
std::move(op));
}
@@ -237,8 +236,8 @@
SkMatrix viewMatrix;
viewMatrix.setTranslate(x, y);
grPaint.addColorFragmentProcessor(fp);
- sk_sp<GrDrawOp> op(GrRectBatchFactory::CreateNonAAFill(
- GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr));
+ sk_sp<GrDrawOp> op(GrRectOpFactory::MakeNonAAFill(GrColor_WHITE, viewMatrix,
+ renderRect, nullptr, nullptr));
renderTargetContext->priv().testingOnly_addDrawOp(grPaint, GrAAType::kNone,
std::move(op));
}