From 2d743288889c7804e6431bf389cdc6084aaa49ef Mon Sep 17 00:00:00 2001 From: fmalita Date: Tue, 22 Mar 2016 06:32:10 -0700 Subject: Use sk_sp-based picture recording APIs 1) use SkPictureRecorder::finishRecordingAsPicture() over endRecordingAsPicture() 2) convert to sk_sp fields/params where feasible BUG=skia:5077 R=reed@google.com,danakj@chromium.org,enne@chromium.org TBR=pdr@chromium.org,alekseys@chromium.org CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1819683002 Cr-Commit-Position: refs/heads/master@{#382563} --- cc/trees/layer_tree_host_pixeltest_masks.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/trees/layer_tree_host_pixeltest_masks.cc') diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc index 890e94a..3a6f127 100644 --- a/cc/trees/layer_tree_host_pixeltest_masks.cc +++ b/cc/trees/layer_tree_host_pixeltest_masks.cc @@ -61,7 +61,7 @@ class MaskContentLayerClient : public ContentLayerClient { scoped_refptr display_list = DisplayItemList::Create(PaintableRegion(), DisplayItemListSettings()); display_list->CreateAndAppendItem( - PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); + PaintableRegion(), recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; @@ -329,7 +329,7 @@ class CheckerContentLayerClient : public ContentLayerClient { scoped_refptr display_list = DisplayItemList::Create(PaintableRegion(), DisplayItemListSettings()); display_list->CreateAndAppendItem( - PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); + PaintableRegion(), recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; @@ -367,7 +367,7 @@ class CircleContentLayerClient : public ContentLayerClient { scoped_refptr display_list = DisplayItemList::Create(PaintableRegion(), DisplayItemListSettings()); display_list->CreateAndAppendItem( - PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); + PaintableRegion(), recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; -- cgit v1.1