Use sk_sp-based APIs for SkColorFilter

cc/blink/web_display_item_list_impl.cc

 // Copyright 2014 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/blink/web_display_item_list_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 145 matching lines @@
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndTransformDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendCompositingItem(
     const blink::WebRect& visual_rect,
     float opacity,
     SkXfermode::Mode xfermode,
     SkRect* bounds,
     SkColorFilter* color_filter) {

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

can you make this take sk_sp instead?

[tomhudson, 2016/03/28 13:11:17]

This inherits from blink::WebDisplayItemList, and and this point we aren't
exposing sk_sp<> in any Blink APIs.

   DCHECK_GE(opacity, 0.f);
   DCHECK_LE(opacity, 1.f);
   // TODO(ajuma): This should really be rounding instead of flooring the alpha
   // value, but that breaks slimming paint reftests.
 
   const bool kLcdTextRequiresOpaqueLayer = true;
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     display_item_list_->CreateAndAppendItem<cc::CompositingDisplayItem>(
         visual_rect, static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)),
-        xfermode, bounds, skia::SharePtr(color_filter),
-        kLcdTextRequiresOpaqueLayer);
+        xfermode, bounds, sk_ref_sp(color_filter), kLcdTextRequiresOpaqueLayer);
   } else {
     cc::CompositingDisplayItem item(
         static_cast<uint8_t>(gfx::ToFlooredInt(255 * opacity)), xfermode,
-        bounds, skia::SharePtr(color_filter), kLcdTextRequiresOpaqueLayer);
+        bounds, sk_ref_sp(color_filter), kLcdTextRequiresOpaqueLayer);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndCompositingItem(
     const blink::WebRect& visual_rect) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     display_item_list_->CreateAndAppendItem<cc::EndCompositingDisplayItem>(
         visual_rect);
   } else {
@@ skipping 36 matching lines @@
 
 void WebDisplayItemListImpl::appendEndScrollItem(
     const blink::WebRect& visual_rect) {
   appendEndTransformItem(visual_rect);
 }
 
 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
 }
 
 }  // namespace cc_blink