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

cc/trees/layer_tree_host_pixeltest_masks.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "build/build_config.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_image_layer.h"
 #include "cc/layers/picture_layer.h"
@@ skipping 22 matching lines @@
   ~MaskContentLayerClient() override {}
 
   bool FillsBoundsCompletely() const override { return false; }
   size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
 
   gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
 
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       PaintingControlSetting picture_control) override {
     SkPictureRecorder recorder;
-    sk_sp<SkCanvas> canvas = sk_ref_sp(
-        recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_))));
+    SkCanvas* canvas =

[esprehn, 2016/11/15 22:22:21]

What frees the canvas now?

[reed1, 2016/11/16 03:51:20]

The recorder itself maintains ownership of the canvas. That's why beginRecording
returns SkCanvas* instead of either sk_sp<> or unique_ptr<>.

+        recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_)));
 
     SkPaint paint;
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(2));
     paint.setColor(SK_ColorWHITE);
 
     canvas->clear(SK_ColorTRANSPARENT);
     gfx::Rect inset_rect(bounds_);
     while (!inset_rect.IsEmpty()) {
       inset_rect.Inset(3, 3, 2, 2);
@@ skipping 101 matching lines @@
                            SkColor color,
                            bool vertical)
       : bounds_(bounds), color_(color), vertical_(vertical) {}
   ~CheckerContentLayerClient() override {}
   bool FillsBoundsCompletely() const override { return false; }
   size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
   gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       PaintingControlSetting picture_control) override {
     SkPictureRecorder recorder;
-    sk_sp<SkCanvas> canvas = sk_ref_sp(
-        recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_))));
+    SkCanvas* canvas =
+        recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_)));
 
     SkPaint paint;
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(4));
     paint.setColor(color_);
     canvas->clear(SK_ColorTRANSPARENT);
     if (vertical_) {
       for (int i = 4; i < bounds_.width(); i += 16) {
         canvas->drawLine(i, 0, i, bounds_.height(), paint);
       }
@@ skipping 22 matching lines @@
  public:
   explicit CircleContentLayerClient(const gfx::Size& bounds)
       : bounds_(bounds) {}
   ~CircleContentLayerClient() override {}
   bool FillsBoundsCompletely() const override { return false; }
   size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
   gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       PaintingControlSetting picture_control) override {
     SkPictureRecorder recorder;
-    sk_sp<SkCanvas> canvas = sk_ref_sp(
-        recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_))));
+    SkCanvas* canvas =
+        recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_)));
 
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(SK_ColorWHITE);
     canvas->clear(SK_ColorTRANSPARENT);
     canvas->drawCircle(bounds_.width() / 2,
                        bounds_.height() / 2,
                        bounds_.width() / 4,
                        paint);
 
@@ skipping 118 matching lines @@
 
   RunPixelResourceTest(background,
                        base::FilePath(
                            FILE_PATH_LITERAL("mask_of_layer_with_blend.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // !defined(OS_ANDROID)