diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 4 | ||||
| -rw-r--r-- | tests/PrimitiveProcessorTest.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index f981793dd2..0ab7a1ecb0 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -327,7 +327,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { GrPaint grPaint; - sk_sp<GrDrawOp> op(GrRandomDrawOp(&random, context)); + std::unique_ptr<GrDrawOp> op(GrRandomDrawOp(&random, context)); SkASSERT(op); GrProcessorTestData ptd(&random, context, context->caps(), @@ -363,7 +363,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { for (int i = 0; i < fpFactoryCnt; ++i) { // Since FP factories internally randomize, call each 10 times. for (int j = 0; j < 10; ++j) { - sk_sp<GrDrawOp> op(GrRandomDrawOp(&random, context)); + std::unique_ptr<GrDrawOp> op(GrRandomDrawOp(&random, context)); SkASSERT(op); GrProcessorTestData ptd(&random, context, context->caps(), renderTargetContext.get(), dummyTextures); diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 9cb2f8a6a8..c4c4a9bdb2 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -31,7 +31,9 @@ public: const char* name() const override { return "Dummy Op"; } - static sk_sp<GrDrawOp> Make(int numAttribs) { return sk_sp<GrDrawOp>(new Op(numAttribs)); } + static std::unique_ptr<GrDrawOp> Make(int numAttribs) { + return std::unique_ptr<GrDrawOp>(new Op(numAttribs)); + } private: Op(int numAttribs) : INHERITED(ClassID()), fNumAttribs(numAttribs) { |