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

cc/tiles/software_image_decode_controller.cc

Index: cc/tiles/software_image_decode_controller.cc
diff --git a/cc/tiles/software_image_decode_controller.cc b/cc/tiles/software_image_decode_controller.cc
index f05bb5d01adb4a5932aa94e9908e3d877fef4c2f..0b417ba56cecfc01c8074313925313ea17831ddf 100644
--- a/cc/tiles/software_image_decode_controller.cc
+++ b/cc/tiles/software_image_decode_controller.cc
@@ -63,7 +63,7 @@ class ImageDecodeTaskImpl : public ImageDecodeTask {
       : controller_(controller),
         image_key_(image_key),
         image_(image),
-        image_ref_(skia::SharePtr(image.image())),
+        image_ref_(image.image()),

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

sk_ref_sp(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) {}
 
   // Overridden from Task:
@@ -89,7 +89,7 @@ class ImageDecodeTaskImpl : public ImageDecodeTask {
   SoftwareImageDecodeController* controller_;
   SoftwareImageDecodeController::ImageKey image_key_;
   DrawImage image_;
-  skia::RefPtr<const SkImage> image_ref_;
+  sk_sp<const SkImage> image_ref_;
   uint64_t source_prepare_tiles_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDecodeTaskImpl);
@@ -369,19 +369,19 @@ SoftwareImageDecodeController::DecodeImageInternal(
   TRACE_EVENT1("disabled-by-default-cc.debug",
                "SoftwareImageDecodeController::DecodeImageInternal", "key",
                key.ToString());
-  const SkImage* image = draw_image.image();
+  sk_sp<const SkImage> image(draw_image.image());

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

sk_ref_sp(draw_image.image())?

(or just leave as is/raw ptr - I don't think having a local sk_sp is helping
much here)

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

This is now returning sk_sp<>, and passing it on to clients - who need it in
that form because they may take a ref.

   if (!image)
     return nullptr;
 
   switch (key.filter_quality()) {
     case kNone_SkFilterQuality:
     case kLow_SkFilterQuality:
-      return GetOriginalImageDecode(key, *image);
+      return GetOriginalImageDecode(key, *image.get());
     case kMedium_SkFilterQuality:
       NOTIMPLEMENTED();
       return nullptr;
     case kHigh_SkFilterQuality:
-      return GetScaledImageDecode(key, *image);
+      return GetScaledImageDecode(key, *image.get());
     default:
       NOTREACHED();
       return nullptr;
@@ -886,9 +886,9 @@ SoftwareImageDecodeController::DecodedImage::DecodedImage(
       memory_(std::move(memory)),
       src_rect_offset_(src_rect_offset),
       tracing_id_(tracing_id) {
-  image_ = skia::AdoptRef(SkImage::NewFromRaster(
-      image_info_, memory_->data(), image_info_.minRowBytes(),
-      [](const void* pixels, void* context) {}, nullptr));
+  SkPixmap p(image_info_, memory_->data(), image_info_.minRowBytes());
+  image_ = SkImage::MakeFromRaster(p, [](const void* pixels, void* context) {},
+                                   nullptr);
 }
 
 SoftwareImageDecodeController::DecodedImage::~DecodedImage() {