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/CanvasStateHelpers.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/CanvasStateHelpers.cpp')
-rw-r--r-- | tests/CanvasStateHelpers.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/CanvasStateHelpers.cpp b/tests/CanvasStateHelpers.cpp index 801eaead49..98b5d231be 100644 --- a/tests/CanvasStateHelpers.cpp +++ b/tests/CanvasStateHelpers.cpp @@ -27,12 +27,11 @@ void complex_layers_draw(SkCanvas* canvas, float left, float top, extern "C" bool complex_layers_draw_from_canvas_state(SkCanvasState* state, float left, float top, float right, float bottom, int32_t spacer) { - SkCanvas* canvas = SkCanvasStateUtils::CreateFromCanvasState(state); + std::unique_ptr<SkCanvas> canvas = SkCanvasStateUtils::MakeFromCanvasState(state); if (!canvas) { return false; } - complex_layers_draw(canvas, left, top, right, bottom, spacer); - canvas->unref(); + complex_layers_draw(canvas.get(), left, top, right, bottom, spacer); return true; } @@ -52,7 +51,7 @@ void complex_clips_draw(SkCanvas* canvas, int32_t left, int32_t top, extern "C" bool complex_clips_draw_from_canvas_state(SkCanvasState* state, int32_t left, int32_t top, int32_t right, int32_t bottom, int32_t clipOp, int32_t regionRects, int32_t* rectCoords) { - SkCanvas* canvas = SkCanvasStateUtils::CreateFromCanvasState(state); + std::unique_ptr<SkCanvas> canvas = SkCanvasStateUtils::MakeFromCanvasState(state); if (!canvas) { return false; } @@ -64,8 +63,7 @@ extern "C" bool complex_clips_draw_from_canvas_state(SkCanvasState* state, rectCoords += 4; } - complex_clips_draw(canvas, left, top, right, bottom, clipOp, localRegion); - canvas->unref(); + complex_clips_draw(canvas.get(), left, top, right, bottom, clipOp, localRegion); return true; } #endif // SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG |