Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

mojo/skia/ganesh_image_factory.cc

Index: mojo/skia/ganesh_image_factory.cc
diff --git a/mojo/skia/ganesh_image_factory.cc b/mojo/skia/ganesh_image_factory.cc
index 95d3ef1fbe9fa477223b0f61a877ef20dda1d466..fc381f9859fbb3166334fe0ebdfb1c872cdcda08 100644
--- a/mojo/skia/ganesh_image_factory.cc
+++ b/mojo/skia/ganesh_image_factory.cc
@@ -24,13 +24,12 @@ void ReleaseThunk(void* data) {
 }
 }  // namespace
 
-::skia::RefPtr<SkImage> CreateImageFromTexture(
-    const GaneshContext::Scope& scope,
-    uint32_t texture_id,
-    uint32_t width,
-    uint32_t height,
-    GrSurfaceOrigin origin,
-    const base::Closure& release_callback) {
+sk_sp<SkImage> CreateImageFromTexture(const GaneshContext::Scope& scope,
+                                      uint32_t texture_id,
+                                      uint32_t width,
+                                      uint32_t height,
+                                      GrSurfaceOrigin origin,
+                                      const base::Closure& release_callback) {
   DCHECK(texture_id);
   DCHECK(width);
   DCHECK(height);
@@ -47,9 +46,9 @@ void ReleaseThunk(void* data) {
   desc.fConfig = kSkia8888_GrPixelConfig;
   desc.fOrigin = origin;
   desc.fTextureHandle = reinterpret_cast<GrBackendObject>(&info);
-  return ::skia::AdoptRef(SkImage::NewFromTexture(
-      scope.gr_context().get(), desc, kPremul_SkAlphaType, &ReleaseThunk,
-      new base::Closure(release_callback)));
+  return SkImage::MakeFromTexture(scope.gr_context().get(), desc,
+                                  kPremul_SkAlphaType, &ReleaseThunk,
+                                  new base::Closure(release_callback));
 }
 
 MailboxTextureImageGenerator::MailboxTextureImageGenerator(