diff options
| author |  Mike Reed <reed@google.com> | 2016-11-12 08:06:55 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-13 18:31:13 +0000 |
| commit | 5df4934b3e40cdc378e225d1dda39f015cae9bae (patch) | |
| tree | f0871dcbca35730333ad3b14115e6a14987fac7b /tests/CanvasStateTest.cpp | |
| parent | f982cb37e3092e7a69c13a12ec09806ceff5af45 (diff) | |
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/CanvasStateTest.cpp')
| -rw-r--r-- | tests/CanvasStateTest.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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<SkCanvas> tmpCanvas = SkCanvasStateUtils::MakeFromCanvasState(state); REPORTER_ASSERT(reporter, tmpCanvas); REPORTER_ASSERT(reporter, canvas.getDrawFilter()); REPORTER_ASSERT(reporter, nullptr == tmpCanvas->getDrawFilter()); - tmpCanvas->unref(); SkCanvasStateUtils::ReleaseCanvasState(state); } |