diff options
author | 2017-01-03 09:42:58 -0500 | |
---|---|---|
committer | 2017-01-03 15:22:16 +0000 | |
commit | f8334781914363caf537f22f012fcd5c03c60dad (patch) | |
tree | cfa54aa4a80cd7841959300c245d633fbcd382a0 /src/gpu/GrDrawOpTest.cpp | |
parent | 5f500920e719b215d5e0e36a6679995ed3c9b4ad (diff) |
Remove ref counting from GrOp.
Instead use std::unique_ptr to manage GrOp lifetime.
Change-Id: Ic1dc1e0ffd7254c3994221f498677af5bbf66a71
Reviewed-on: https://skia-review.googlesource.com/6479
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpTest.cpp')
-rw-r--r-- | src/gpu/GrDrawOpTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/GrDrawOpTest.cpp b/src/gpu/GrDrawOpTest.cpp index bb26acc696..3cf1a90b8e 100644 --- a/src/gpu/GrDrawOpTest.cpp +++ b/src/gpu/GrDrawOpTest.cpp @@ -12,7 +12,8 @@ #ifdef GR_TEST_UTILS -#define DRAW_OP_TEST_EXTERN(Op) extern sk_sp<GrDrawOp> Op##__Test(SkRandom*, GrContext* context); +#define DRAW_OP_TEST_EXTERN(Op) \ + extern std::unique_ptr<GrDrawOp> Op##__Test(SkRandom*, GrContext* context); #define DRAW_OP_TEST_ENTRY(Op) Op##__Test @@ -37,8 +38,8 @@ DRAW_OP_TEST_EXTERN(TesselatingPathOp); DRAW_OP_TEST_EXTERN(TextBlobOp); DRAW_OP_TEST_EXTERN(VerticesOp); -sk_sp<GrDrawOp> GrRandomDrawOp(SkRandom* random, GrContext* context) { - using MakeTestDrawOpFn = sk_sp<GrDrawOp>(SkRandom* random, GrContext* context); +std::unique_ptr<GrDrawOp> GrRandomDrawOp(SkRandom* random, GrContext* context) { + using MakeTestDrawOpFn = std::unique_ptr<GrDrawOp>(SkRandom* random, GrContext* context); static constexpr MakeTestDrawOpFn* gFactories[] = { DRAW_OP_TEST_ENTRY(AAConvexPathOp), DRAW_OP_TEST_ENTRY(AADistanceFieldPathOp), |