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/blink/web_display_item_list_impl.cc | 6 ++--- cc/blink/web_display_item_list_impl.h | 3 ++- cc/layers/layer.cc | 4 ++-- cc/layers/layer.h | 3 +-- cc/layers/layer_impl.cc | 4 ++-- cc/layers/layer_impl.h | 3 +-- cc/layers/picture_image_layer.cc | 6 ++--- cc/layers/picture_layer.cc | 4 ++-- cc/layers/picture_layer.h | 2 +- cc/layers/picture_layer_impl.cc | 2 +- cc/layers/picture_layer_impl.h | 2 +- cc/playback/display_item_list.cc | 5 ++-- cc/playback/display_item_list.h | 2 +- cc/playback/display_item_list_unittest.cc | 36 ++++++++++++----------------- cc/playback/display_list_raster_source.cc | 6 ++--- cc/playback/display_list_raster_source.h | 3 +-- cc/playback/drawing_display_item.cc | 10 ++++---- cc/playback/drawing_display_item.h | 8 +++---- cc/raster/gpu_rasterizer.cc | 3 +-- cc/test/fake_content_layer_client.cc | 7 +++--- cc/test/solid_color_content_layer_client.cc | 2 +- cc/trees/layer_tree_host_pixeltest_masks.cc | 6 ++--- cc/trees/layer_tree_host_pixeltest_tiles.cc | 2 +- 23 files changed, 57 insertions(+), 72 deletions(-) (limited to 'cc') diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc index 451a5d5..810a559 100644 --- a/cc/blink/web_display_item_list_impl.cc +++ b/cc/blink/web_display_item_list_impl.cc @@ -50,12 +50,12 @@ WebDisplayItemListImpl::WebDisplayItemListImpl( void WebDisplayItemListImpl::appendDrawingItem( const blink::WebRect& visual_rect, - const SkPicture* picture) { + sk_sp picture) { if (display_item_list_->RetainsIndividualDisplayItems()) { display_item_list_->CreateAndAppendItem( - visual_rect, skia::SharePtr(picture)); + visual_rect, std::move(picture)); } else { - cc::DrawingDisplayItem item(skia::SharePtr(picture)); + cc::DrawingDisplayItem item(std::move(picture)); display_item_list_->RasterIntoCanvas(item); } } diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h index 17e58d5..a54ac0e 100644 --- a/cc/blink/web_display_item_list_impl.h +++ b/cc/blink/web_display_item_list_impl.h @@ -42,7 +42,8 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList { ~WebDisplayItemListImpl() override; // blink::WebDisplayItemList implementation. - void appendDrawingItem(const blink::WebRect&, const SkPicture*) override; + void appendDrawingItem(const blink::WebRect&, + sk_sp) override; void appendClipItem( const blink::WebRect& visual_rect, const blink::WebRect& clip_rect, diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 7f1dd1d..0567738 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -217,8 +217,8 @@ bool Layer::IsPropertyChangeAllowed() const { return !layer_tree_host_->in_paint_layer_contents(); } -skia::RefPtr Layer::GetPicture() const { - return skia::RefPtr(); +sk_sp Layer::GetPicture() const { + return nullptr; } void Layer::SetParent(Layer* layer) { diff --git a/cc/layers/layer.h b/cc/layers/layer.h index 3005401..86c6e67 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h @@ -28,7 +28,6 @@ #include "cc/layers/paint_properties.h" #include "cc/output/filter_operations.h" #include "cc/trees/property_tree.h" -#include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkImageFilter.h" #include "third_party/skia/include/core/SkPicture.h" @@ -400,7 +399,7 @@ class CC_EXPORT Layer : public base::RefCounted { virtual ScrollbarLayerInterface* ToScrollbarLayer(); - virtual skia::RefPtr GetPicture() const; + virtual sk_sp GetPicture() const; // Constructs a LayerImpl of the correct runtime type for this Layer type. virtual scoped_ptr CreateLayerImpl(LayerTreeImpl* tree_impl); diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 3d4294d..d2c627f 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -464,8 +464,8 @@ bool LayerImpl::user_scrollable(ScrollbarOrientation orientation) const { : user_scrollable_vertical_; } -skia::RefPtr LayerImpl::GetPicture() { - return skia::RefPtr(); +sk_sp LayerImpl::GetPicture() { + return nullptr; } scoped_ptr LayerImpl::CreateLayerImpl(LayerTreeImpl* tree_impl) { diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h index 4564544..31cdfba 100644 --- a/cc/layers/layer_impl.h +++ b/cc/layers/layer_impl.h @@ -32,7 +32,6 @@ #include "cc/quads/shared_quad_state.h" #include "cc/resources/resource_provider.h" #include "cc/tiles/tile_priority.h" -#include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkImageFilter.h" #include "third_party/skia/include/core/SkPicture.h" @@ -530,7 +529,7 @@ class CC_EXPORT LayerImpl { // ReleaseResources call. virtual void RecreateResources(); - virtual skia::RefPtr GetPicture(); + virtual sk_sp GetPicture(); virtual scoped_ptr CreateLayerImpl(LayerTreeImpl* tree_impl); virtual void PushPropertiesTo(LayerImpl* layer); diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc index 05cbb0c..3c17c8c 100644 --- a/cc/layers/picture_image_layer.cc +++ b/cc/layers/picture_image_layer.cc @@ -80,10 +80,8 @@ scoped_refptr PictureImageLayer::PaintContentsToDisplayList( // transparent images blend correctly. canvas->drawImage(image_.get(), 0, 0); - skia::RefPtr picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); - display_list->CreateAndAppendItem(PaintableRegion(), - std::move(picture)); + display_list->CreateAndAppendItem( + PaintableRegion(), recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc index af5cfb4..2763cf90 100644 --- a/cc/layers/picture_layer.cc +++ b/cc/layers/picture_layer.cc @@ -129,12 +129,12 @@ void PictureLayer::SetIsMask(bool is_mask) { is_mask_ = is_mask; } -skia::RefPtr PictureLayer::GetPicture() const { +sk_sp PictureLayer::GetPicture() const { // We could either flatten the DisplayListRecordingSource into a single // SkPicture, or paint a fresh one depending on what we intend to do with the // picture. For now we just paint a fresh one to get consistent results. if (!DrawsContent()) - return skia::RefPtr(); + return nullptr; gfx::Size layer_size = bounds(); scoped_ptr recording_source( diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h index 2d2a03b..727c846 100644 --- a/cc/layers/picture_layer.h +++ b/cc/layers/picture_layer.h @@ -32,7 +32,7 @@ class CC_EXPORT PictureLayer : public Layer { void SetNeedsDisplayRect(const gfx::Rect& layer_rect) override; bool Update() override; void SetIsMask(bool is_mask) override; - skia::RefPtr GetPicture() const override; + sk_sp GetPicture() const override; bool IsSuitableForGpuRasterization() const override; void RunMicroBenchmark(MicroBenchmark* benchmark) override; diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index 4f5ce15..6f5c125 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -649,7 +649,7 @@ void PictureLayerImpl::RecreateResources() { layer_tree_impl()->set_needs_update_draw_properties(); } -skia::RefPtr PictureLayerImpl::GetPicture() { +sk_sp PictureLayerImpl::GetPicture() { return raster_source_->GetFlattenedPicture(); } diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h index df9bdcf..c4f4257 100644 --- a/cc/layers/picture_layer_impl.h +++ b/cc/layers/picture_layer_impl.h @@ -49,7 +49,7 @@ class CC_EXPORT PictureLayerImpl void DidBeginTracing() override; void ReleaseResources() override; void RecreateResources() override; - skia::RefPtr GetPicture() override; + sk_sp GetPicture() override; Region GetInvalidationRegionForDebugging() override; // PictureLayerTilingClient overrides. diff --git a/cc/playback/display_item_list.cc b/cc/playback/display_item_list.cc index b88a65a..91f9cf2 100644 --- a/cc/playback/display_item_list.cc +++ b/cc/playback/display_item_list.cc @@ -184,7 +184,7 @@ void DisplayItemList::Finalize() { // Convert to an SkPicture for faster rasterization. DCHECK(settings_.use_cached_picture); DCHECK(!picture_); - picture_ = skia::AdoptRef(recorder_->endRecordingAsPicture()); + picture_ = recorder_->finishRecordingAsPicture(); DCHECK(picture_); picture_memory_usage_ = SkPictureUtils::ApproximateBytesUsed(picture_.get()); @@ -265,8 +265,7 @@ DisplayItemList::AsValue(bool include_items) const { canvas->translate(-layer_rect_.x(), -layer_rect_.y()); canvas->clipRect(gfx::RectToSkRect(layer_rect_)); Raster(canvas, NULL, gfx::Rect(), 1.f); - skia::RefPtr picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); + sk_sp picture = recorder.finishRecordingAsPicture(); std::string b64_picture; PictureDebugUtil::SerializeAsBase64(picture.get(), &b64_picture); diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h index 9022fd1..5d33d24 100644 --- a/cc/playback/display_item_list.h +++ b/cc/playback/display_item_list.h @@ -126,7 +126,7 @@ class CC_EXPORT DisplayItemList // |items_| . These rects are intentionally kept separate // because they are not needed while walking the |items_| for raster. std::vector visual_rects_; - skia::RefPtr picture_; + sk_sp picture_; scoped_ptr recorder_; skia::RefPtr canvas_; diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc index a6aac41..f75d12d 100644 --- a/cc/playback/display_item_list_unittest.cc +++ b/cc/playback/display_item_list_unittest.cc @@ -56,7 +56,7 @@ void AppendFirstSerializationTestPicture(scoped_refptr list, canvas->translate(offset.x(), offset.y()); canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); } void AppendSecondSerializationTestPicture(scoped_refptr list, @@ -73,7 +73,7 @@ void AppendSecondSerializationTestPicture(scoped_refptr list, canvas->translate(offset.x(), offset.y()); canvas->drawRectCoords(3.f, 3.f, 7.f, 7.f, blue_paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); } void ValidateDisplayItemListSerialization(const gfx::Size& layer_size, @@ -256,7 +256,6 @@ TEST(DisplayItemListTest, SingleDrawingItem) { gfx::Rect layer_rect(100, 100); SkPictureRecorder recorder; skia::RefPtr canvas; - skia::RefPtr picture; SkPaint blue_paint; blue_paint.setColor(SK_ColorBLUE); SkPaint red_paint; @@ -273,9 +272,8 @@ TEST(DisplayItemListTest, SingleDrawingItem) { canvas->translate(offset.x(), offset.y()); canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); - picture = skia::AdoptRef(recorder.endRecordingAsPicture()); - list->CreateAndAppendItem(kVisualRect, - std::move(picture)); + list->CreateAndAppendItem( + kVisualRect, recorder.finishRecordingAsPicture()); list->Finalize(); DrawDisplayList(pixels, layer_rect, list); @@ -317,7 +315,7 @@ TEST(DisplayItemListTest, ClipItem) { canvas->translate(first_offset.x(), first_offset.y()); canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); gfx::Rect clip_rect(60, 60, 10, 10); list->CreateAndAppendItem(kVisualRect, clip_rect, @@ -331,7 +329,7 @@ TEST(DisplayItemListTest, ClipItem) { canvas->translate(second_offset.x(), second_offset.y()); canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); list->CreateAndAppendItem(kVisualRect); list->Finalize(); @@ -377,7 +375,7 @@ TEST(DisplayItemListTest, TransformItem) { canvas->translate(first_offset.x(), first_offset.y()); canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); gfx::Transform transform; transform.Rotate(45.0); @@ -391,7 +389,7 @@ TEST(DisplayItemListTest, TransformItem) { canvas->translate(second_offset.x(), second_offset.y()); canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); list->CreateAndAppendItem(kVisualRect); list->Finalize(); @@ -472,7 +470,6 @@ TEST(DisplayItemListTest, CompactingItems) { gfx::Rect layer_rect(100, 100); SkPictureRecorder recorder; skia::RefPtr canvas; - skia::RefPtr picture; SkPaint blue_paint; blue_paint.setColor(SK_ColorBLUE); SkPaint red_paint; @@ -492,7 +489,7 @@ TEST(DisplayItemListTest, CompactingItems) { canvas->translate(offset.x(), offset.y()); canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); - picture = skia::AdoptRef(recorder.endRecordingAsPicture()); + sk_sp picture = recorder.finishRecordingAsPicture(); list_without_caching->CreateAndAppendItem(kVisualRect, picture); list_without_caching->Finalize(); @@ -535,8 +532,7 @@ TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithCachedPicture) { paint.setAntiAlias(true); canvas->drawPath(path, paint); - skia::RefPtr suitable_picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); + sk_sp suitable_picture = recorder.finishRecordingAsPicture(); list->CreateAndAppendItem(kVisualRect, suitable_picture); list->Finalize(); @@ -556,8 +552,7 @@ TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithCachedPicture) { skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect))); for (int i = 0; i < 10; ++i) canvas->drawPath(path, paint); - skia::RefPtr unsuitable_picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); + sk_sp unsuitable_picture = recorder.finishRecordingAsPicture(); list->CreateAndAppendItem(kVisualRect, unsuitable_picture); list->Finalize(); @@ -600,7 +595,7 @@ TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithoutCachedPicture) { canvas->drawPath(path, paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); list->Finalize(); // A single DrawingDisplayItem with a large AA concave path shouldn't trigger @@ -613,7 +608,7 @@ TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithoutCachedPicture) { for (int i = 0; i < 10; ++i) canvas->drawPath(path, paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); list->Finalize(); // A single DrawingDisplayItem with several large AA concave paths should @@ -626,7 +621,7 @@ TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithoutCachedPicture) { skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect))); canvas->drawPath(path, paint); list->CreateAndAppendItem( - kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture())); + kVisualRect, recorder.finishRecordingAsPicture()); } list->Finalize(); @@ -649,8 +644,7 @@ TEST(DisplayItemListTest, ApproximateMemoryUsage) { SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(layer_rect)); for (int i = 0; i < kNumCommandsInTestSkPicture; i++) canvas->drawPaint(blue_paint); - skia::RefPtr picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); + sk_sp picture = recorder.finishRecordingAsPicture(); size_t picture_size = SkPictureUtils::ApproximateBytesUsed(picture.get()); ASSERT_GE(picture_size, kNumCommandsInTestSkPicture * sizeof(blue_paint)); diff --git a/cc/playback/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc index a6d2c84..970648f 100644 --- a/cc/playback/display_list_raster_source.cc +++ b/cc/playback/display_list_raster_source.cc @@ -260,7 +260,7 @@ void DisplayListRasterSource::RasterCommon( } } -skia::RefPtr DisplayListRasterSource::GetFlattenedPicture() { +sk_sp DisplayListRasterSource::GetFlattenedPicture() { TRACE_EVENT0("cc", "DisplayListRasterSource::GetFlattenedPicture"); gfx::Rect display_list_rect(size_); @@ -272,10 +272,8 @@ skia::RefPtr DisplayListRasterSource::GetFlattenedPicture() { 1.f); RasterCommon(canvas, nullptr, display_list_rect, display_list_rect, 1.f); } - skia::RefPtr picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); - return picture; + return recorder.finishRecordingAsPicture(); } size_t DisplayListRasterSource::GetPictureMemoryUsage() const { diff --git a/cc/playback/display_list_raster_source.h b/cc/playback/display_list_raster_source.h index 361019c..f9df196 100644 --- a/cc/playback/display_list_raster_source.h +++ b/cc/playback/display_list_raster_source.h @@ -18,7 +18,6 @@ #include "cc/debug/rendering_stats_instrumentation.h" #include "cc/playback/display_list_recording_source.h" #include "skia/ext/analysis_canvas.h" -#include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkPicture.h" namespace cc { @@ -103,7 +102,7 @@ class CC_EXPORT DisplayListRasterSource // Tracing functionality. virtual void DidBeginTracing(); virtual void AsValueInto(base::trace_event::TracedValue* array) const; - virtual skia::RefPtr GetFlattenedPicture(); + virtual sk_sp GetFlattenedPicture(); virtual size_t GetPictureMemoryUsage() const; // Return true if LCD anti-aliasing may be used when rastering text. diff --git a/cc/playback/drawing_display_item.cc b/cc/playback/drawing_display_item.cc index f8832cb..9d8b978 100644 --- a/cc/playback/drawing_display_item.cc +++ b/cc/playback/drawing_display_item.cc @@ -26,7 +26,7 @@ namespace cc { DrawingDisplayItem::DrawingDisplayItem() {} -DrawingDisplayItem::DrawingDisplayItem(skia::RefPtr picture) { +DrawingDisplayItem::DrawingDisplayItem(sk_sp picture) { SetNew(std::move(picture)); } @@ -35,13 +35,13 @@ DrawingDisplayItem::DrawingDisplayItem( ImageSerializationProcessor* image_serialization_processor) { DCHECK_EQ(proto::DisplayItem::Type_Drawing, proto.type()); - skia::RefPtr picture; + sk_sp picture; const proto::DrawingDisplayItem& details = proto.drawing_item(); if (details.has_picture()) { SkMemoryStream stream(details.picture().data(), details.picture().size()); - picture = skia::AdoptRef(SkPicture::CreateFromStream( - &stream, image_serialization_processor->GetPixelDeserializer())); + picture = SkPicture::MakeFromStream( + &stream, image_serialization_processor->GetPixelDeserializer()); } SetNew(std::move(picture)); @@ -54,7 +54,7 @@ DrawingDisplayItem::DrawingDisplayItem(const DrawingDisplayItem& item) { DrawingDisplayItem::~DrawingDisplayItem() { } -void DrawingDisplayItem::SetNew(skia::RefPtr picture) { +void DrawingDisplayItem::SetNew(sk_sp picture) { picture_ = std::move(picture); } diff --git a/cc/playback/drawing_display_item.h b/cc/playback/drawing_display_item.h index 8045904..0e7c640 100644 --- a/cc/playback/drawing_display_item.h +++ b/cc/playback/drawing_display_item.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/playback/display_item.h" -#include "skia/ext/refptr.h" +#include "third_party/skia/include/core/SkRefCnt.h" #include "ui/gfx/geometry/point_f.h" class SkCanvas; @@ -22,7 +22,7 @@ class ImageSerializationProcessor; class CC_EXPORT DrawingDisplayItem : public DisplayItem { public: DrawingDisplayItem(); - explicit DrawingDisplayItem(skia::RefPtr picture); + explicit DrawingDisplayItem(sk_sp picture); explicit DrawingDisplayItem( const proto::DisplayItem& proto, ImageSerializationProcessor* image_serialization_processor); @@ -45,9 +45,9 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem { void CloneTo(DrawingDisplayItem* item) const; private: - void SetNew(skia::RefPtr picture); + void SetNew(sk_sp picture); - skia::RefPtr picture_; + sk_sp picture_; }; } // namespace cc diff --git a/cc/raster/gpu_rasterizer.cc b/cc/raster/gpu_rasterizer.cc index 7e8c131..18c83f7 100644 --- a/cc/raster/gpu_rasterizer.cc +++ b/cc/raster/gpu_rasterizer.cc @@ -55,8 +55,7 @@ void GpuRasterizer::RasterizeSource( raster_source->PlaybackToCanvas(canvas.get(), raster_full_rect, playback_rect, scale, include_images); canvas->restore(); - skia::RefPtr picture = - skia::AdoptRef(recorder.endRecordingAsPicture()); + sk_sp picture = recorder.finishRecordingAsPicture(); // Turn on distance fields for layers that have ever animated. bool use_distance_field_text = 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( - 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( - PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); + PaintableRegion(), recorder.finishRecordingAsPicture()); if (!it->transform.IsIdentity()) { display_list->CreateAndAppendItem( 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( - 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( - clip, skia::AdoptRef(recorder.endRecordingAsPicture())); + clip, recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; 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; diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc index fecc47e..764e37d 100644 --- a/cc/trees/layer_tree_host_pixeltest_tiles.cc +++ b/cc/trees/layer_tree_host_pixeltest_tiles.cc @@ -133,7 +133,7 @@ class BlueYellowClient : public ContentLayerClient { canvas->drawRect(gfx::RectToSkRect(yellow_rect), paint); display_list->CreateAndAppendItem( - PaintableRegion(), skia::AdoptRef(recorder.endRecordingAsPicture())); + PaintableRegion(), recorder.finishRecordingAsPicture()); display_list->Finalize(); return display_list; } -- cgit v1.1