Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1425)

Unified Diff: cc/raster/gpu_raster_buffer_provider.cc

Issue 2509983004: Revert "Change call-sites now that SkCanvas is not ref-counted" (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/playback/display_item_list_unittest.cc ('k') | cc/test/fake_content_layer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/raster/gpu_raster_buffer_provider.cc
diff --git a/cc/raster/gpu_raster_buffer_provider.cc b/cc/raster/gpu_raster_buffer_provider.cc
index aaf2ea4ff3178b6c63661718b2f05792c24db58e..dbe72d62dc03e169f21caafa6067fe5c964e03c6 100644
--- a/cc/raster/gpu_raster_buffer_provider.cc
+++ b/cc/raster/gpu_raster_buffer_provider.cc
@@ -60,8 +60,8 @@ static sk_sp<SkPicture> PlaybackToPicture(
// Play back raster_source into temp SkPicture.
SkPictureRecorder recorder;
- SkCanvas* canvas =
- recorder.beginRecording(resource_size.width(), resource_size.height());
+ sk_sp<SkCanvas> canvas = sk_ref_sp(
+ recorder.beginRecording(resource_size.width(), resource_size.height()));
canvas->save();
// The GPU image decode controller assumes that Skia is done with an image
@@ -73,7 +73,7 @@ static sk_sp<SkPicture> PlaybackToPicture(
// later picture rasterization.
RasterSource::PlaybackSettings settings = playback_settings;
settings.use_image_hijack_canvas = false;
- raster_source->PlaybackToCanvas(canvas, raster_full_rect, playback_rect,
+ raster_source->PlaybackToCanvas(canvas.get(), raster_full_rect, playback_rect,
scales, settings);
canvas->restore();
return recorder.finishRecordingAsPicture();
« no previous file with comments | « cc/playback/display_item_list_unittest.cc ('k') | cc/test/fake_content_layer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698