Use sk_sp-based APIs for SkColorFilter

cc/playback/compositing_display_item.h

 // Copyright 2015 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_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
 
 namespace cc {
 class ImageSerializationProcessor;
 
 class CC_EXPORT CompositingDisplayItem : public DisplayItem {
  public:
   CompositingDisplayItem(uint8_t alpha,
                          SkXfermode::Mode xfermode,
                          SkRect* bounds,
-                         skia::RefPtr<SkColorFilter> color_filter,
+                         sk_sp<SkColorFilter> color_filter,
                          bool lcd_text_requires_opaque_layer);
   explicit CompositingDisplayItem(const proto::DisplayItem& proto);
   ~CompositingDisplayItem() override;
 
   void ToProtobuf(proto::DisplayItem* proto,
                   ImageSerializationProcessor* image_serialization_processor)
       const override;
   void Raster(SkCanvas* canvas,
               const gfx::Rect& canvas_target_playback_rect,
               SkPicture::AbortCallback* callback) const override;
   void AsValueInto(const gfx::Rect& visual_rect,
                    base::trace_event::TracedValue* array) const override;
   size_t ExternalMemoryUsage() const override;
 
   int ApproximateOpCount() const { return 1; }
   bool IsSuitableForGpuRasterization() const { return true; }
 
  private:
   void SetNew(uint8_t alpha,
               SkXfermode::Mode xfermode,
               SkRect* bounds,
-              skia::RefPtr<SkColorFilter> color_filter,
+              sk_sp<SkColorFilter> color_filter,
               bool lcd_text_requires_opaque_layer);
 
   uint8_t alpha_;
   SkXfermode::Mode xfermode_;
   bool has_bounds_;
   SkRect bounds_;
-  skia::RefPtr<SkColorFilter> color_filter_;
+  sk_sp<SkColorFilter> color_filter_;
   bool lcd_text_requires_opaque_layer_;
 };
 
 class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
  public:
   EndCompositingDisplayItem();
   explicit EndCompositingDisplayItem(const proto::DisplayItem& proto);
   ~EndCompositingDisplayItem() override;
 
   static scoped_ptr<EndCompositingDisplayItem> Create() {
@@ skipping 10 matching lines @@
                    base::trace_event::TracedValue* array) const override;
   size_t ExternalMemoryUsage() const override;
 
   int ApproximateOpCount() const { return 0; }
   bool IsSuitableForGpuRasterization() const { return true; }
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_