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

cc/resources/ui_resource_bitmap.cc

 // 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.
 
 #include "cc/resources/ui_resource_bitmap.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 17 matching lines @@
       break;
     default:
       NOTREACHED() << "Invalid SkColorType for UIResourceBitmap: " << sk_type;
       break;
   }
   return format;
 }
 
 }  // namespace
 
-void UIResourceBitmap::Create(const skia::RefPtr<SkPixelRef>& pixel_ref,
+void UIResourceBitmap::Create(sk_sp<SkPixelRef> pixel_ref,
                               const gfx::Size& size,
                               UIResourceFormat format) {
   DCHECK(size.width());
   DCHECK(size.height());
   DCHECK(pixel_ref);
   DCHECK(pixel_ref->isImmutable());
   format_ = format;
   size_ = size;
-  pixel_ref_ = pixel_ref;
+  pixel_ref_ = std::move(pixel_ref);
 
   // Default values for secondary parameters.
   opaque_ = (format == ETC1);
 }
 
 UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap) {
   DCHECK_EQ(skbitmap.width(), skbitmap.rowBytesAsPixels());
   DCHECK(skbitmap.isImmutable());
 
-  skia::RefPtr<SkPixelRef> pixel_ref = skia::SharePtr(skbitmap.pixelRef());
+  sk_sp<SkPixelRef> pixel_ref = sk_ref_sp(skbitmap.pixelRef());
   const SkImageInfo& info = pixel_ref->info();
   Create(pixel_ref, gfx::Size(info.width(), info.height()),

[f(malita), 2016/04/27 14:00:41]

std::move(pixel_ref)?

[tomhudson, 2016/04/27 14:43:12]

Done.

          SkColorTypeToUIResourceFormat(skbitmap.colorType()));
 
   SetOpaque(skbitmap.isOpaque());
 }
 
 UIResourceBitmap::UIResourceBitmap(const gfx::Size& size, bool is_opaque) {
   SkAlphaType alphaType = is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
   SkImageInfo info =
       SkImageInfo::MakeN32(size.width(), size.height(), alphaType);
-  skia::RefPtr<SkPixelRef> pixel_ref = skia::AdoptRef(
+  sk_sp<SkPixelRef> pixel_ref(
       SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), NULL));
   pixel_ref->setImmutable();
-  Create(pixel_ref, size, UIResourceBitmap::RGBA8);
+  Create(std::move(pixel_ref), size, UIResourceBitmap::RGBA8);
   SetOpaque(is_opaque);
 }
 
-UIResourceBitmap::UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref,
+UIResourceBitmap::UIResourceBitmap(sk_sp<SkPixelRef> pixel_ref,
                                    const gfx::Size& size) {
-  Create(pixel_ref, size, UIResourceBitmap::ETC1);
+  Create(std::move(pixel_ref), size, UIResourceBitmap::ETC1);
 }
 
 UIResourceBitmap::UIResourceBitmap(const UIResourceBitmap& other) = default;
 
 UIResourceBitmap::~UIResourceBitmap() {}
 
 AutoLockUIResourceBitmap::AutoLockUIResourceBitmap(
     const UIResourceBitmap& bitmap) : bitmap_(bitmap) {
   bitmap_.pixel_ref_->lockPixels();
 }
 
 AutoLockUIResourceBitmap::~AutoLockUIResourceBitmap() {
   bitmap_.pixel_ref_->unlockPixels();
 }
 
 const uint8_t* AutoLockUIResourceBitmap::GetPixels() const {
   return static_cast<const uint8_t*>(bitmap_.pixel_ref_->pixels());
 }
 
 }  // namespace cc