aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/OnFlushCallbackTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/OnFlushCallbackTest.cpp')
-rw-r--r--tests/OnFlushCallbackTest.cpp24
1 files changed, 17 insertions, 7 deletions
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index e9e4dd0462..7932fdc458 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -34,13 +34,18 @@ public:
DEFINE_OP_CLASS_ID
// This creates an instance of a simple non-AA solid color rect-drawing Op
- static std::unique_ptr<GrDrawOp> Make(GrPaint&& paint, const SkRect& r) {
- return Helper::FactoryHelper<NonAARectOp>(std::move(paint), r, nullptr, ClassID());
+ static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ GrPaint&& paint,
+ const SkRect& r) {
+ return Helper::FactoryHelper<NonAARectOp>(context, std::move(paint), r, nullptr, ClassID());
}
// This creates an instance of a simple non-AA textured rect-drawing Op
- static std::unique_ptr<GrDrawOp> Make(GrPaint&& paint, const SkRect& r, const SkRect& local) {
- return Helper::FactoryHelper<NonAARectOp>(std::move(paint), r, &local, ClassID());
+ static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ GrPaint&& paint,
+ const SkRect& r,
+ const SkRect& local) {
+ return Helper::FactoryHelper<NonAARectOp>(context, std::move(paint), r, &local, ClassID());
}
GrColor color() const { return fColor; }
@@ -189,8 +194,12 @@ public:
int id() const { return fID; }
- static std::unique_ptr<AtlasedRectOp> Make(GrPaint&& paint, const SkRect& r, int id) {
- GrDrawOp* op = Helper::FactoryHelper<AtlasedRectOp>(std::move(paint), r, id).release();
+ static std::unique_ptr<AtlasedRectOp> Make(GrContext* context,
+ GrPaint&& paint,
+ const SkRect& r,
+ int id) {
+ GrDrawOp* op = Helper::FactoryHelper<AtlasedRectOp>(context, std::move(paint),
+ r, id).release();
return std::unique_ptr<AtlasedRectOp>(static_cast<AtlasedRectOp*>(op));
}
@@ -435,7 +444,8 @@ static sk_sp<GrTextureProxy> make_upstream_image(GrContext* context, AtlasObject
GrPaint paint;
paint.addColorFragmentProcessor(std::move(fp));
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
- std::unique_ptr<AtlasedRectOp> op(AtlasedRectOp::Make(std::move(paint), r, start + i));
+ std::unique_ptr<AtlasedRectOp> op(AtlasedRectOp::Make(context,
+ std::move(paint), r, start + i));
AtlasedRectOp* sparePtr = op.get();