From 67b39de70fb5d10caebfc75f418754186e5226c3 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 7 Nov 2016 11:47:44 -0500 Subject: s/SkAutoTUnref/sk_sp/ in src/ part 1 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4480 Change-Id: I7d3219b02ad5094785e1b7635a9482e69aadbc8c Reviewed-on: https://skia-review.googlesource.com/4480 Reviewed-by: Ben Wagner Commit-Queue: Hal Canary --- src/utils/SkCanvasStateUtils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/utils/SkCanvasStateUtils.cpp') diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp index 3426126d46..062dc13ed9 100644 --- a/src/utils/SkCanvasStateUtils.cpp +++ b/src/utils/SkCanvasStateUtils.cpp @@ -304,7 +304,7 @@ static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layer SkASSERT(!bitmap.empty()); SkASSERT(!bitmap.isNull()); - SkAutoTUnref canvas(new SkCanvas(bitmap)); + sk_sp canvas(new SkCanvas(bitmap)); // setup the matrix and clip setup_canvas_from_MC_state(layerState.mcState, canvas.get()); @@ -323,14 +323,14 @@ SkCanvas* SkCanvasStateUtils::CreateFromCanvasState(const SkCanvasState* state) return nullptr; } - SkAutoTUnref canvas(new SkCanvasStack(state->width, state->height)); + sk_sp canvas(new SkCanvasStack(state->width, state->height)); // setup the matrix and clip on the n-way canvas - setup_canvas_from_MC_state(state_v1->mcState, canvas); + setup_canvas_from_MC_state(state_v1->mcState, canvas.get()); // Iterate over the layers and add them to the n-way canvas for (int i = state_v1->layerCount - 1; i >= 0; --i) { - SkAutoTUnref canvasLayer(create_canvas_from_canvas_layer(state_v1->layers[i])); + sk_sp canvasLayer(create_canvas_from_canvas_layer(state_v1->layers[i])); if (!canvasLayer.get()) { return nullptr; } -- cgit v1.2.3