diff options
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 |