Change call-sites now that SkCanvas is not ref-counted

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>
 
@@ skipping 34 matching lines @@
 namespace {
 
 const gfx::Rect kVisualRect(0, 0, 42, 42);
 
 scoped_refptr<DisplayItemList> CreateDefaultList() {
   return DisplayItemList::Create(DisplayItemListSettings());
 }
 
 sk_sp<const SkPicture> CreateRectPicture(const gfx::Rect& bounds) {
   SkPictureRecorder recorder;
-  sk_sp<SkCanvas> canvas;
+  SkCanvas* canvas;
 
-  canvas = sk_ref_sp(recorder.beginRecording(bounds.width(), bounds.height()));
+  canvas = recorder.beginRecording(bounds.width(), bounds.height());

[danakj, 2016/11/14 19:35:15]

nit: move the var defn here too, so we don't have an uninit pointer ever

[reed1, 2016/11/14 20:50:07]

Done.

   canvas->drawRect(
       SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height()),
       SkPaint());
   return recorder.finishRecordingAsPicture();
 }
 
 void AppendFirstSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                          const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 3.f);
   SkPictureRecorder recorder;
-  sk_sp<SkCanvas> canvas;
+  SkCanvas* canvas;
 
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
 
-  canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
-      offset.x(), offset.y(), layer_size.width(), layer_size.height())));
+  canvas = recorder.beginRecording(SkRect::MakeXYWH(

[danakj, 2016/11/14 19:35:15]

same

[reed1, 2016/11/14 20:50:07]

Done.

+      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->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void AppendSecondSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                           const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 2.f);
   SkPictureRecorder recorder;
-  sk_sp<SkCanvas> canvas;
+  SkCanvas* canvas;
 
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
 
-  canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
-      offset.x(), offset.y(), layer_size.width(), layer_size.height())));
+  canvas = recorder.beginRecording(SkRect::MakeXYWH(

[danakj, 2016/11/14 19:35:14]

same

[reed1, 2016/11/14 20:50:08]

Done.

+      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->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void ValidateDisplayItemListSerialization(const gfx::Size& layer_size,
                                           scoped_refptr<DisplayItemList> list) {
   list->Finalize();
 
@@ skipping 186 matching lines @@
 
   // Build the EndTransformDisplayItem.
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
-  sk_sp<SkCanvas> canvas;
+  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(settings);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
-  canvas =
-      sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
+  canvas = recorder.beginRecording(gfx::RectFToSkRect(recording_rect));

[danakj, 2016/11/14 19:35:14]

same

[reed1, 2016/11/14 20:50:08]

Done.

   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->CreateAndAppendDrawingItem<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;
-  sk_sp<SkCanvas> canvas;
+  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(settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
-  canvas = sk_ref_sp(
-      recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
+  canvas = recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));

[danakj, 2016/11/14 19:35:15]

same

[reed1, 2016/11/14 20:50:08]

Done.

   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Rect clip_rect(60, 60, 10, 10);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_rect, std::vector<SkRRect>(), true);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
-  canvas = sk_ref_sp(
-      recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
+  canvas = 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->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
@@ skipping 11 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;
-  sk_sp<SkCanvas> canvas;
+  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(settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
-  canvas = sk_ref_sp(
-      recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
+  canvas = recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));

[danakj, 2016/11/14 19:35:14]

same

[reed1, 2016/11/14 20:50:07]

Done.

   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Transform transform;
   transform.Rotate(45.0);
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(transform);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
-  canvas = sk_ref_sp(
-      recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
+  canvas = 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->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
@@ skipping 41 matching lines @@
   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->CreateAndAppendPairedBeginItem<FilterDisplayItem>(
       filters, filter_bounds, filter_bounds.origin());
 
   // Include a rect drawing so that filter is actually applied to something.
   {
     SkPictureRecorder recorder;
-    sk_sp<SkCanvas> canvas;
+    SkCanvas* canvas;
 
     SkPaint red_paint;
     red_paint.setColor(SK_ColorRED);
 
-    canvas = sk_ref_sp(recorder.beginRecording(
-        SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height())));
+    canvas = recorder.beginRecording(

[danakj, 2016/11/14 19:35:15]

same

[reed1, 2016/11/14 20:50:08]

Done.

+        SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height()));
     canvas->drawRectCoords(filter_bounds.x(), filter_bounds.y(),
                            filter_bounds.right(), filter_bounds.bottom(),
                            red_paint);
     list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         ToNearestRect(filter_bounds), recorder.finishRecordingAsPicture());
   }
 
   list->CreateAndAppendPairedEndItem<EndFilterDisplayItem>();
   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;
-  sk_sp<SkCanvas> canvas;
+  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;
   scoped_refptr<DisplayItemList> list_without_caching =
       DisplayItemList::Create(no_caching_settings);
 
-  canvas =
-      sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
+  canvas = recorder.beginRecording(gfx::RectFToSkRect(recording_rect));

[danakj, 2016/11/14 19:35:14]

same

[reed1, 2016/11/14 20:50:07]

Done.

   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->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, picture);
   list_without_caching->Finalize();
   DrawDisplayList(pixels, layer_rect, list_without_caching);
 
   unsigned char expected_pixels[4 * 100 * 100] = {0};
@@ skipping 406 matching lines @@
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(4u, list->size());
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(2));
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(3));
 }
 
 }  // namespace cc