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

cc/output/filter_operation.h

 // 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.
 
 #ifndef CC_OUTPUT_FILTER_OPERATION_H_
 #define CC_OUTPUT_FILTER_OPERATION_H_
 
 #include <memory>
 
 #include "base/logging.h"
 #include "cc/base/cc_export.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
@@ skipping 47 matching lines @@
   gfx::Point drop_shadow_offset() const {
     DCHECK_EQ(type_, DROP_SHADOW);
     return drop_shadow_offset_;
   }
 
   SkColor drop_shadow_color() const {
     DCHECK_EQ(type_, DROP_SHADOW);
     return drop_shadow_color_;
   }
 
-  skia::RefPtr<SkImageFilter> image_filter() const {
+  sk_sp<SkImageFilter> image_filter() const {
     DCHECK_EQ(type_, REFERENCE);
     return image_filter_;
   }
 
   const SkScalar* matrix() const {
     DCHECK_EQ(type_, COLOR_MATRIX);
     return matrix_;
   }
 
   int zoom_inset() const {
@@ skipping 50 matching lines @@
 
   static FilterOperation CreateColorMatrixFilter(SkScalar matrix[20]) {
     return FilterOperation(COLOR_MATRIX, matrix);
   }
 
   static FilterOperation CreateZoomFilter(float amount, int inset) {
     return FilterOperation(ZOOM, amount, inset);
   }
 
   static FilterOperation CreateReferenceFilter(
-      const skia::RefPtr<SkImageFilter>& image_filter) {
-    return FilterOperation(REFERENCE, image_filter);
+      const sk_sp<SkImageFilter> image_filter) {

[fmalita_google_do_not_use, 2016/04/16 15:48:42]

When pass-by-val, the param should be non-const - otherwise we're not going to
trigger the move ctor below.

(ditto for all other methods)

[tomhudson, 2016/04/25 20:20:50]

Done.

+    return FilterOperation(REFERENCE, std::move(image_filter));
   }
 
   static FilterOperation CreateSaturatingBrightnessFilter(float amount) {
     return FilterOperation(SATURATING_BRIGHTNESS, amount);
   }
 
   static FilterOperation CreateAlphaThresholdFilter(const SkRegion& region,
                                                     float inner_threshold,
                                                     float outer_threshold) {
     return FilterOperation(ALPHA_THRESHOLD, region,
@@ skipping 27 matching lines @@
   void set_drop_shadow_offset(const gfx::Point& offset) {
     DCHECK_EQ(type_, DROP_SHADOW);
     drop_shadow_offset_ = offset;
   }
 
   void set_drop_shadow_color(SkColor color) {
     DCHECK_EQ(type_, DROP_SHADOW);
     drop_shadow_color_ = color;
   }
 
-  void set_image_filter(const skia::RefPtr<SkImageFilter>& image_filter) {
+  void set_image_filter(const sk_sp<SkImageFilter> image_filter) {
     DCHECK_EQ(type_, REFERENCE);
     image_filter_ = image_filter;
   }
 
   void set_matrix(const SkScalar matrix[20]) {
     DCHECK_EQ(type_, COLOR_MATRIX);
     for (unsigned i = 0; i < 20; ++i)
       matrix_[i] = matrix[i];
   }
 
@@ skipping 28 matching lines @@
 
   FilterOperation(FilterType type,
                   const gfx::Point& offset,
                   float stdDeviation,
                   SkColor color);
 
   FilterOperation(FilterType, SkScalar matrix[20]);
 
   FilterOperation(FilterType type, float amount, int inset);
 
-  FilterOperation(FilterType type,
-                  const skia::RefPtr<SkImageFilter>& image_filter);
+  FilterOperation(FilterType type, const sk_sp<SkImageFilter> image_filter);
 
   FilterOperation(FilterType type,
                   const SkRegion& region,
                   float inner_threshold,
                   float outer_threshold);
 
   FilterType type_;
   float amount_;
   float outer_threshold_;
   gfx::Point drop_shadow_offset_;
   SkColor drop_shadow_color_;
-  skia::RefPtr<SkImageFilter> image_filter_;
+  sk_sp<SkImageFilter> image_filter_;
   SkScalar matrix_[20];
   int zoom_inset_;
   SkRegion region_;
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_FILTER_OPERATION_H_