Use sk_sp-based APIs for SkColorFilter

cc/playback/compositing_display_item.cc

 // 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.
 
 #include "cc/playback/compositing_display_item.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/skia_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkFlattenable.h"
 #include "third_party/skia/include/core/SkFlattenableSerialization.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 class ImageSerializationProcessor;
 
 CompositingDisplayItem::CompositingDisplayItem(
     uint8_t alpha,
     SkXfermode::Mode xfermode,
     SkRect* bounds,
-    skia::RefPtr<SkColorFilter> cf,
+    sk_sp<SkColorFilter> cf,
     bool lcd_text_requires_opaque_layer) {
   SetNew(alpha, xfermode, bounds, std::move(cf),
          lcd_text_requires_opaque_layer);
 }
 
 CompositingDisplayItem::CompositingDisplayItem(
     const proto::DisplayItem& proto) {
   DCHECK_EQ(proto::DisplayItem::Type_Compositing, proto.type());
 
   const proto::CompositingDisplayItem& details = proto.compositing_item();
   uint8_t alpha = static_cast<uint8_t>(details.alpha());
   SkXfermode::Mode xfermode = SkXfermodeModeFromProto(details.mode());
   scoped_ptr<SkRect> bounds;
   if (details.has_bounds()) {
     bounds.reset(
         new SkRect(gfx::RectFToSkRect(ProtoToRectF(details.bounds()))));
   }
 
-  skia::RefPtr<SkColorFilter> filter;
+  sk_sp<SkColorFilter> filter;
   if (details.has_color_filter()) {
     SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(
         details.color_filter().c_str(), details.color_filter().size(),
         SkColorFilter::GetFlattenableType());
-    filter = skia::AdoptRef(static_cast<SkColorFilter*>(flattenable));
+    filter = sk_sp<SkColorFilter>(static_cast<SkColorFilter*>(flattenable));

[danakj, 2016/03/26 00:49:51]

filter.reset(static...(flattenable))

   }
 
   bool lcd_text_requires_opaque_layer =
       details.lcd_text_requires_opaque_layer();
 
   SetNew(alpha, xfermode, bounds.get(), std::move(filter),
          lcd_text_requires_opaque_layer);
 }
 
 CompositingDisplayItem::~CompositingDisplayItem() {
 }
 
 void CompositingDisplayItem::SetNew(uint8_t alpha,
                                     SkXfermode::Mode xfermode,
                                     SkRect* bounds,
-                                    skia::RefPtr<SkColorFilter> cf,
+                                    sk_sp<SkColorFilter> cf,
                                     bool lcd_text_requires_opaque_layer) {
   alpha_ = alpha;
   xfermode_ = xfermode;
   has_bounds_ = !!bounds;
   if (bounds)
     bounds_ = SkRect(*bounds);
   color_filter_ = std::move(cf);
   lcd_text_requires_opaque_layer_ = lcd_text_requires_opaque_layer;
 }
 
@@ skipping 18 matching lines @@
   details->set_lcd_text_requires_opaque_layer(lcd_text_requires_opaque_layer_);
 }
 
 void CompositingDisplayItem::Raster(
     SkCanvas* canvas,
     const gfx::Rect& canvas_target_playback_rect,
     SkPicture::AbortCallback* callback) const {
   SkPaint paint;
   paint.setXfermodeMode(xfermode_);
   paint.setAlpha(alpha_);
-  paint.setColorFilter(color_filter_.get());
+  paint.setColorFilter(color_filter_);
   const SkRect* bounds = has_bounds_ ? &bounds_ : nullptr;
   if (lcd_text_requires_opaque_layer_)
     canvas->saveLayer(bounds, &paint);
   else
     canvas->saveLayerPreserveLCDTextRequests(bounds, &paint);
 }
 
 void CompositingDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
@@ skipping 43 matching lines @@
   array->AppendString(
       base::StringPrintf("EndCompositingDisplayItem visualRect: [%s]",
                          visual_rect.ToString().c_str()));
 }
 
 size_t EndCompositingDisplayItem::ExternalMemoryUsage() const {
   return 0;
 }
 
 }  // namespace cc