Replace many skia::RefPtr with sk_sp<> in cc/

cc/playback/display_item_list_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/playback/display_item_list.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/clip_path_display_item.h"
 #include "cc/playback/compositing_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/filter_display_item.h"
 #include "cc/playback/float_clip_display_item.h"
 #include "cc/playback/transform_display_item.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/skia_common.h"
-#include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "third_party/skia/include/effects/SkImageSource.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 namespace {
 
 const gfx::Rect kVisualRect(0, 0, 42, 42);
 
 void AppendFirstSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                          const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 3.f);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
 
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
 
-  canvas = skia::SharePtr(recorder.beginRecording(SkRect::MakeXYWH(
+  canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height())));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void AppendSecondSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                           const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 2.f);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
 
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
 
-  canvas = skia::SharePtr(recorder.beginRecording(SkRect::MakeXYWH(
+  canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height())));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(3.f, 3.f, 7.f, 7.f, blue_paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void ValidateDisplayItemListSerialization(const gfx::Size& layer_size,
                                           scoped_refptr<DisplayItemList> list) {
   list->Finalize();
@@ skipping 166 matching lines @@
 
   // Build the EndTransformDisplayItem.
   list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings settings;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
-  canvas = skia::SharePtr(
-      recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
+  canvas =
+      sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
   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);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   SkCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
   expected_canvas.drawRectCoords(0.f + offset.x(), 0.f + offset.y(),
                                  60.f + offset.x(), 60.f + offset.y(),
                                  red_paint);
   expected_canvas.drawRectCoords(50.f + offset.x(), 50.f + offset.y(),
                                  75.f + offset.x(), 75.f + offset.y(),
                                  blue_paint);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, ClipItem) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings settings;
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
-  canvas = skia::SharePtr(
+  canvas = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Rect clip_rect(60, 60, 10, 10);
   list->CreateAndAppendItem<ClipDisplayItem>(kVisualRect, clip_rect,
                                              std::vector<SkRRect>());
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
-  canvas = skia::SharePtr(
+  canvas = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
   canvas->translate(second_offset.x(), second_offset.y());
   canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   list->CreateAndAppendItem<EndClipDisplayItem>(kVisualRect);
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
@@ skipping 12 matching lines @@
   expected_canvas.drawRectCoords(
       50.f + second_offset.x(), 50.f + second_offset.y(),
       75.f + second_offset.x(), 75.f + second_offset.y(), blue_paint);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, TransformItem) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings settings;
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
-  canvas = skia::SharePtr(
+  canvas = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Transform transform;
   transform.Rotate(45.0);
   list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
-  canvas = skia::SharePtr(
+  canvas = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
   canvas->translate(second_offset.x(), second_offset.y());
   canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
@@ skipping 21 matching lines @@
   FilterOperations filters;
   unsigned char pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings settings;
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   sk_sp<SkSurface> source_surface = SkSurface::MakeRasterN32Premul(50, 50);
   SkCanvas* source_canvas = source_surface->getCanvas();
   source_canvas->clear(SkColorSetRGB(128, 128, 128));
-  skia::RefPtr<SkImage> source_image =
-      skia::AdoptRef(source_surface->newImageSnapshot());
+  sk_sp<SkImage> source_image = source_surface->makeImageSnapshot();
 
   // For most SkImageFilters, the |dst| bounds computed by computeFastBounds are
   // dependent on the provided |src| bounds. This means, for example, that
   // translating |src| results in a corresponding translation of |dst|. But this
   // is not the case for all SkImageFilters; for some of them (e.g.
   // SkImageSource), the computation of |dst| in computeFastBounds doesn't
   // involve |src| at all. Incorrectly assuming such a relationship (e.g. by
   // translating |dst| after it is computed by computeFastBounds, rather than
   // translating |src| before it provided to computedFastBounds) can cause
   // incorrect clipping of filter output. To test for this, we include an
   // SkImageSource filter in |filters|. Here, |src| is |filter_bounds|, defined
   // below.
-  skia::RefPtr<SkImageFilter> image_filter =
-      skia::AdoptRef(SkImageSource::Create(source_image.get()));
+  sk_sp<SkImageFilter> image_filter = SkImageSource::Make(source_image);
   filters.Append(FilterOperation::CreateReferenceFilter(image_filter));
   filters.Append(FilterOperation::CreateBrightnessFilter(0.5f));
   gfx::RectF filter_bounds(10.f, 10.f, 50.f, 50.f);
   list->CreateAndAppendItem<FilterDisplayItem>(kVisualRect, filters,
                                                filter_bounds);
   list->CreateAndAppendItem<EndFilterDisplayItem>(kVisualRect);
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkPaint paint;
   paint.setColor(SkColorSetRGB(64, 64, 64));
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   SkCanvas expected_canvas(expected_bitmap);
   expected_canvas.drawRect(RectFToSkRect(filter_bounds), paint);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, CompactingItems) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
 
   DisplayItemListSettings no_caching_settings;
   no_caching_settings.use_cached_picture = false;
   scoped_refptr<DisplayItemList> list_without_caching =
       DisplayItemList::Create(layer_rect, no_caching_settings);
 
-  canvas = skia::SharePtr(
-      recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
+  canvas =
+      sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
   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);
   sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
   list_without_caching->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
                                                                 picture);
   list_without_caching->Finalize();
   DrawDisplayList(pixels, layer_rect, list_without_caching);
 
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings caching_settings;
   caching_settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list_with_caching =
       DisplayItemList::Create(layer_rect, caching_settings);
   list_with_caching->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
                                                              picture);
   list_with_caching->Finalize();
   DrawDisplayList(expected_pixels, layer_rect, list_with_caching);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithCachedPicture) {
   gfx::Rect layer_rect(1000, 1000);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
+  sk_sp<SkCanvas> canvas;
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
-  canvas =
-      skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
+  canvas = sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
 
   SkPath path;
   path.moveTo(0, 0);
   path.lineTo(0, 100);
   path.lineTo(50, 50);
   path.lineTo(100, 100);
   path.lineTo(100, 0);
   path.close();
 
   SkPaint paint;
   paint.setAntiAlias(true);
   canvas->drawPath(path, paint);
 
   sk_sp<SkPicture> suitable_picture = recorder.finishRecordingAsPicture();
   list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect, suitable_picture);
   list->Finalize();
 
   // A single DrawingDisplayItem with a large AA concave path shouldn't trigger
   // a veto.
   EXPECT_TRUE(list->IsSuitableForGpuRasterization());
 
   // Now check the RasterIntoCanvas path.
   list = DisplayItemList::Create(layer_rect, settings);
   DrawingDisplayItem suitable_item(suitable_picture);
   list->RasterIntoCanvas(suitable_item);
   list->Finalize();
   EXPECT_TRUE(list->IsSuitableForGpuRasterization());
 
   list = DisplayItemList::Create(layer_rect, settings);
-  canvas =
-      skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
+  canvas = sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
   for (int i = 0; i < 10; ++i)
     canvas->drawPath(path, paint);
   sk_sp<SkPicture> unsuitable_picture = recorder.finishRecordingAsPicture();
   list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
                                                 unsuitable_picture);
   list->Finalize();
 
   // A single DrawingDisplayItem with several large AA concave paths should
   // trigger a veto.
   EXPECT_FALSE(list->IsSuitableForGpuRasterization());
 
   // Now check the RasterIntoCanvas path.
   list = DisplayItemList::Create(layer_rect, settings);
   DrawingDisplayItem unsuitable_item(unsuitable_picture);
   list->RasterIntoCanvas(unsuitable_item);
   list->Finalize();
   EXPECT_FALSE(list->IsSuitableForGpuRasterization());
 }
 
 TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithoutCachedPicture) {
   gfx::Rect layer_rect(1000, 1000);
   SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
-  skia::RefPtr<SkPicture> picture;
+  sk_sp<SkCanvas> canvas;
+  sk_sp<SkPicture> picture;
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
-  canvas =
-      skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
+  canvas = sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
 
   SkPath path;
   path.moveTo(0, 0);
   path.lineTo(0, 100);
   path.lineTo(50, 50);
   path.lineTo(100, 100);
   path.lineTo(100, 0);
   path.close();
 
   SkPaint paint;
   paint.setAntiAlias(true);
   canvas->drawPath(path, paint);
 
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
 
   // A single DrawingDisplayItem with a large AA concave path shouldn't trigger
   // a veto.
   EXPECT_TRUE(list->IsSuitableForGpuRasterization());
 
   list = DisplayItemList::Create(layer_rect, settings);
-  canvas =
-      skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
+  canvas = sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
   for (int i = 0; i < 10; ++i)
     canvas->drawPath(path, paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
 
   // A single DrawingDisplayItem with several large AA concave paths should
   // trigger a veto.
   EXPECT_FALSE(list->IsSuitableForGpuRasterization());
 
   list = DisplayItemList::Create(layer_rect, settings);
   for (int i = 0; i < 10; ++i) {
-    canvas =
-        skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
+    canvas = sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
     canvas->drawPath(path, paint);
     list->CreateAndAppendItem<DrawingDisplayItem>(
         kVisualRect, recorder.finishRecordingAsPicture());
   }
   list->Finalize();
 
   // Without a cached picture, having several DrawingDisplayItems that each
   // contain a single large AA concave will not trigger a veto, since each item
   // is individually suitable for GPU rasterization.
   EXPECT_TRUE(list->IsSuitableForGpuRasterization());
@@ skipping 121 matching lines @@
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("\"items\":"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   // There should be no skp64 entry present as the items aren't included and the
   // layer rect is empty.
   EXPECT_EQ(value.find("\"skp64\":"), std::string::npos);
 }
 
 }  // namespace cc