| Index: cc/test/fake_content_layer_client.cc
|
| diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
|
| index 49cf38f184910c97c28e1e760999748dc08aabd2..452dce099dcfcb8a00319335c31647b7dfa4d744 100644
|
| --- a/cc/test/fake_content_layer_client.cc
|
| +++ b/cc/test/fake_content_layer_client.cc
|
| @@ -20,12 +20,12 @@ namespace cc {
|
| FakeContentLayerClient::ImageData::ImageData(const SkImage* img,
|
| const gfx::Point& point,
|
| const SkPaint& paint)
|
| - : image(skia::SharePtr(img)), point(point), paint(paint) {}
|
| + : image(sk_ref_sp(img)), point(point), paint(paint) {}
|
|
|
| FakeContentLayerClient::ImageData::ImageData(const SkImage* img,
|
| const gfx::Transform& transform,
|
| const SkPaint& paint)
|
| - : image(skia::SharePtr(img)), transform(transform), paint(paint) {}
|
| + : image(sk_ref_sp(img)), transform(transform), paint(paint) {}
|
|
|
| FakeContentLayerClient::ImageData::ImageData(const ImageData& other) = default;
|
|
|
| @@ -57,14 +57,13 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| scoped_refptr<DisplayItemList> display_list =
|
| DisplayItemList::Create(PaintableRegion(), settings);
|
| SkPictureRecorder recorder;
|
| - skia::RefPtr<SkCanvas> canvas;
|
| + sk_sp<SkCanvas> canvas;
|
|
|
| for (RectPaintVector::const_iterator it = draw_rects_.begin();
|
| it != draw_rects_.end(); ++it) {
|
| const gfx::RectF& draw_rect = it->first;
|
| const SkPaint& paint = it->second;
|
| - canvas =
|
| - skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
|
| + canvas = sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
|
| canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
|
| display_list->CreateAndAppendItem<DrawingDisplayItem>(
|
| ToEnclosingRect(draw_rect), recorder.finishRecordingAsPicture());
|
| @@ -76,7 +75,7 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| display_list->CreateAndAppendItem<TransformDisplayItem>(PaintableRegion(),
|
| it->transform);
|
| }
|
| - canvas = skia::SharePtr(
|
| + canvas = sk_ref_sp(
|
| recorder.beginRecording(it->image->width(), it->image->height()));
|
| canvas->drawImage(it->image.get(), it->point.x(), it->point.y(),
|
| &it->paint);
|
| @@ -94,8 +93,7 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| while (!draw_rect.IsEmpty()) {
|
| SkPaint paint;
|
| paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
|
| - canvas =
|
| - skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect)));
|
| + canvas = sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(draw_rect)));
|
| canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint);
|
| display_list->CreateAndAppendItem<DrawingDisplayItem>(
|
| draw_rect, recorder.finishRecordingAsPicture());
|
| @@ -103,7 +101,6 @@ FakeContentLayerClient::PaintContentsToDisplayList(
|
| }
|
| }
|
|
|
| -
|
| display_list->Finalize();
|
| return display_list;
|
| }
|
|
|