From 5df4934b3e40cdc378e225d1dda39f015cae9bae Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 12 Nov 2016 08:06:55 -0600 Subject: Revert[2] "Change SkCanvas to *not* inherit from SkRefCnt" Changes over original: - conditionalize ownership in SkPictureRecorder - conditionalize ownership in SkCanvasStateUtils This reverts commit b613c266df48cf45296ecc23d1bd7098c84bb7ba. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4742 Change-Id: Ib25514d6f546c69b6650b5c957403b04f7380dc2 Reviewed-on: https://skia-review.googlesource.com/4742 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/CanvasStateTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/CanvasStateTest.cpp') diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 890e85d3b8..2c7c5905ef 100644 --- a/tests/CanvasStateTest.cpp +++ b/tests/CanvasStateTest.cpp @@ -278,13 +278,12 @@ DEF_TEST(CanvasState_test_draw_filters, reporter) { SkCanvasState* state = SkCanvasStateUtils::CaptureCanvasState(&canvas); REPORTER_ASSERT(reporter, state); - SkCanvas* tmpCanvas = SkCanvasStateUtils::CreateFromCanvasState(state); + std::unique_ptr tmpCanvas = SkCanvasStateUtils::MakeFromCanvasState(state); REPORTER_ASSERT(reporter, tmpCanvas); REPORTER_ASSERT(reporter, canvas.getDrawFilter()); REPORTER_ASSERT(reporter, nullptr == tmpCanvas->getDrawFilter()); - tmpCanvas->unref(); SkCanvasStateUtils::ReleaseCanvasState(state); } -- cgit v1.2.3