Clean up cc/paint interfaces

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 98 matching lines @@
   populateSourceGraphicImageFilters(sourceGraphic, std::move(filter),
                                     sourceGraphic->operatingColorSpace());
 }
 
 static float kMaxMaskBufferSize =
     50.f * 1024.f * 1024.f / 4.f;  // 50MB / 4 bytes per pixel
 
 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.
     SkBitmap bitmap;
     const SkRect cullRect = maskRecord->cullRect();
     if (static_cast<float>(cullRect.width()) *
             static_cast<float>(cullRect.height()) <
         kMaxMaskBufferSize) {
       bitmap.allocPixels(
           SkImageInfo::MakeN32Premul(cullRect.width(), cullRect.height()));
@@ skipping 11 matching lines @@
           SkBlendMode::kSrcIn,
           SkOffsetImageFilter::Make(cullRect.x(), cullRect.y(),
                                     SkImageSource::Make(image)),
           input, &cropRect);
     } else {
       // If the buffer is excessively big, give up and make an
       // SkPictureImageFilter anyway, even if it might not render.
       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 {
     maskedInput = input;
   }
   sk_sp<SkImageFilter> flipImageFilter = SkImageFilter::MakeMatrixFilter(
       reflection.reflectionMatrix(), kLow_SkFilterQuality,
       std::move(maskedInput));
   return SkXfermodeImageFilter::Make(SkBlendMode::kSrcOver,
                                      std::move(flipImageFilter),
                                      std::move(input), nullptr);
 }
 
 }  // namespace SkiaImageFilterBuilder
 }  // namespace blink