diff options
| author | fmalita <fmalita@chromium.org> | 2016-03-22 06:32:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 13:33:15 +0000 |
| commit | 2d743288889c7804e6431bf389cdc6084aaa49ef (patch) | |
| tree | 95409a0d222e17f9e678b97040c0567ede58c4bc /cc/test | |
| parent | c2db76301d3eb61575d807d2897da86d637cbd34 (diff) | |
| download | chromium_src-2d743288889c7804e6431bf389cdc6084aaa49ef.zip chromium_src-2d743288889c7804e6431bf389cdc6084aaa49ef.tar.gz chromium_src-2d743288889c7804e6431bf389cdc6084aaa49ef.tar.bz2 | |
Use sk_sp-based picture recording APIs
1) use SkPictureRecorder::finishRecordingAsPicture() over
endRecordingAsPicture()
2) convert to sk_sp<SkPicture> 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}
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/fake_content_layer_client.cc | 7 | ||||
| -rw-r--r-- | cc/test/solid_color_content_layer_client.cc | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc index 88c4f80..49cf38f 100644 --- a/cc/test/fake_content_layer_client.cc +++ b/cc/test/fake_content_layer_client.cc @@ -67,8 +67,7 @@ FakeContentLayerClient::PaintContentsToDisplayList( skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect))); canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint); display_list->CreateAndAppendItem<DrawingDisplayItem>( - ToEnclosingRect(draw_rect), - skia::AdoptRef(recorder.endRecordingAsPicture())); + ToEnclosingRect(draw_rect), recorder.finishRecordingAsPicture()); } for (ImageVector::const_iterator it = draw_images_.begin(); @@ -82,7 +81,7 @@ FakeContentLayerClient::PaintContentsToDisplayList( canvas->drawImage(it->image.get(), it->point.x(), it->point.y(), &it->paint); display_list->CreateAndAppendItem<DrawingDisplayItem>( - PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); + PaintableRegion(), recorder.finishRecordingAsPicture()); if (!it->transform.IsIdentity()) { display_list->CreateAndAppendItem<EndTransformDisplayItem>( PaintableRegion()); @@ -99,7 +98,7 @@ FakeContentLayerClient::PaintContentsToDisplayList( skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect))); canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint); display_list->CreateAndAppendItem<DrawingDisplayItem>( - draw_rect, skia::AdoptRef(recorder.endRecordingAsPicture())); + draw_rect, recorder.finishRecordingAsPicture()); draw_rect.Inset(1, 1); } } diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc index 2973aff..5e384ac 100644 --- a/cc/test/solid_color_content_layer_client.cc +++ b/cc/test/solid_color_content_layer_client.cc @@ -43,7 +43,7 @@ SolidColorContentLayerClient::PaintContentsToDisplayList( DisplayItemList::Create(clip, settings); display_list->CreateAndAppendItem<DrawingDisplayItem>( - clip, skia::AdoptRef(recorder.endRecordingAsPicture())); + clip, recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; |