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

cc/tiles/gpu_image_decode_controller.cc

Index: cc/tiles/gpu_image_decode_controller.cc
diff --git a/cc/tiles/gpu_image_decode_controller.cc b/cc/tiles/gpu_image_decode_controller.cc
index ab683d69abc698c0a9435187e0c3e707ed953f31..2c8e3ac00f5d5fce8e1dfcdd93bf8384346dbf44 100644
--- a/cc/tiles/gpu_image_decode_controller.cc
+++ b/cc/tiles/gpu_image_decode_controller.cc
@@ -15,9 +15,9 @@
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu_image_decode_controller.h"
-#include "skia/ext/refptr.h"
 #include "skia/ext/texture_handle.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/GrTexture.h"
@@ -64,7 +64,7 @@ class ImageDecodeTaskImpl : public ImageDecodeTask {
                       uint64_t source_prepare_tiles_id)
       : controller_(controller),
         image_(draw_image),
-        image_ref_(skia::SharePtr(draw_image.image())),
+        image_ref_(sk_ref_sp(draw_image.image())),
         source_prepare_tiles_id_(source_prepare_tiles_id) {
     DCHECK(!SkipImage(draw_image));
   }
@@ -88,7 +88,7 @@ class ImageDecodeTaskImpl : public ImageDecodeTask {
  private:
   GpuImageDecodeController* controller_;
   DrawImage image_;
-  skia::RefPtr<const SkImage> image_ref_;
+  sk_sp<const SkImage> image_ref_;
   const uint64_t source_prepare_tiles_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDecodeTaskImpl);
@@ -106,7 +106,7 @@ class ImageUploadTaskImpl : public ImageDecodeTask {
       : ImageDecodeTask(std::move(decode_dependency)),
         controller_(controller),
         image_(draw_image),
-        image_ref_(skia::SharePtr(draw_image.image())),
+        image_ref_(draw_image.image()),

[f(malita), 2016/04/21 15:45:47]

sk_ref_sp(draw_image.image())?

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

Dana's suggestions made this member go away.

         source_prepare_tiles_id_(source_prepare_tiles_id) {
     DCHECK(!SkipImage(draw_image));
   }
@@ -132,7 +132,7 @@ class ImageUploadTaskImpl : public ImageDecodeTask {
  private:
   GpuImageDecodeController* controller_;
   DrawImage image_;
-  skia::RefPtr<const SkImage> image_ref_;
+  sk_sp<const SkImage> image_ref_;
   uint64_t source_prepare_tiles_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageUploadTaskImpl);
@@ -158,8 +158,7 @@ GpuImageDecodeController::GpuImageDecodeController(ContextProvider* context,
                                                    ResourceFormat decode_format)
     : format_(decode_format),
       context_(context),
-      context_threadsafe_proxy_(
-          skia::AdoptRef(context->GrContext()->threadSafeProxy())),
+      context_threadsafe_proxy_(context->GrContext()->threadSafeProxy()),
       image_data_(ImageDataMRUCache::NO_AUTO_EVICT),
       cached_items_limit_(kMaxDiscardableItems),
       cached_bytes_limit_(kMaxGpuImageBytes),
@@ -676,22 +675,22 @@ void GpuImageDecodeController::UploadImageIfNecessary(
   // cleaned up so we don't exceed our memory limit during this upload.
   DeletePendingImages();
 
-  skia::RefPtr<SkImage> uploaded_image;
+  sk_sp<SkImage> uploaded_image;
   {
     base::AutoUnlock unlock(lock_);
     switch (image_data->mode) {
       case DecodedDataMode::CPU: {
         SkImageInfo image_info = CreateImageInfoForDrawImage(draw_image);
-        uploaded_image = skia::AdoptRef(SkImage::NewFromRaster(
-            image_info, image_data->decode.data->data(),
-            image_info.minRowBytes(), [](const void*, void*) {}, nullptr));
+        SkPixmap p(image_info, image_data->decode.data->data(),
+                   image_info.minRowBytes());
+        uploaded_image =
+            SkImage::MakeFromRaster(p, [](const void*, void*) {}, nullptr);
         break;
       }
       case DecodedDataMode::GPU: {
-        uploaded_image =
-            skia::AdoptRef(SkImage::NewFromDeferredTextureImageData(
-                context_->GrContext(), image_data->decode.data->data(),
-                SkBudgeted::kNo));
+        uploaded_image = SkImage::MakeFromDeferredTextureImageData(
+            context_->GrContext(), image_data->decode.data->data(),
+            SkBudgeted::kNo);
         break;
       }
     }