Clean up cc/paint interfaces

third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp

Index: third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
index 4fba11956b6fb9c119e2a721018eeb66f5b951a0..ff6142b59f75db67f9dc1c002752f8ecfd9d3d45 100644
--- a/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
+++ b/third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp
@@ -116,7 +116,7 @@ static float kMaxMaskBufferSize =
 sk_sp<SkImageFilter> buildBoxReflectFilter(const BoxReflection& reflection,
                                            sk_sp<SkImageFilter> input) {
   sk_sp<SkImageFilter> maskedInput;
-  if (PaintRecord* maskRecord = reflection.mask()) {
+  if (sk_sp<PaintRecord> maskRecord = reflection.mask()) {
     // Since PaintRecords can't be serialized to the browser process, first
     // raster the mask to a bitmap, then encode it in an SkImageSource, which
     // can be serialized.
@@ -148,7 +148,7 @@ sk_sp<SkImageFilter> buildBoxReflectFilter(const BoxReflection& reflection,
       SkImageFilter::CropRect cropRect(maskRecord->cullRect());
       maskedInput = SkXfermodeImageFilter::Make(
           SkBlendMode::kSrcOver,
-          SkPictureImageFilter::Make(sk_ref_sp(ToSkPicture(maskRecord))), input,
+          SkPictureImageFilter::Make(ToSkPicture(maskRecord)), input,

[danakj, 2017/03/16 20:06:16]

move()

           &cropRect);
     }
   } else {