Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

services/gfx/compositor/render/render_image.h

Index: services/gfx/compositor/render/render_image.h
diff --git a/services/gfx/compositor/render/render_image.h b/services/gfx/compositor/render/render_image.h
index d867f9e4a0384474975328fe7b837674f67429af..4e75f7f85548fc55a80f75b3e69dd7ded3d3f36b 100644
--- a/services/gfx/compositor/render/render_image.h
+++ b/services/gfx/compositor/render/render_image.h
@@ -13,8 +13,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "mojo/services/gfx/composition/interfaces/resources.mojom.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace compositor {
 
@@ -29,7 +29,7 @@ class RenderImage : public base::RefCountedThreadSafe<RenderImage> {
   class Generator;
 
  public:
-  RenderImage(const skia::RefPtr<SkImage>& image,
+  RenderImage(const sk_sp<SkImage>& image,
               const scoped_refptr<Releaser>& releaser);
 
   // Creates a new image backed by a mailbox texture.
@@ -51,14 +51,14 @@ class RenderImage : public base::RefCountedThreadSafe<RenderImage> {
   uint32_t height() const { return image_->height(); }
 
   // Gets the underlying image to rasterize, never null.
-  const skia::RefPtr<SkImage>& image() const { return image_; }
+  const sk_sp<SkImage>& image() const { return image_; }
 
  private:
   friend class base::RefCountedThreadSafe<RenderImage>;
 
   ~RenderImage();
 
-  skia::RefPtr<SkImage> image_;
+  sk_sp<SkImage> image_;
   scoped_refptr<Releaser> releaser_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderImage);