Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

services/gfx/compositor/render/render_image.cc

 // Copyright 2015 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 "services/gfx/compositor/render/render_image.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "mojo/skia/ganesh_image_factory.h"
@@ skipping 37 matching lines @@
         releaser_(releaser) {
     DCHECK(releaser_);
   }
 
   ~Generator() override {}
 
  private:
   scoped_refptr<Releaser> releaser_;
 };
 
-RenderImage::RenderImage(const skia::RefPtr<SkImage>& image,
+RenderImage::RenderImage(const sk_sp<SkImage>& image,
                          const scoped_refptr<Releaser>& releaser)
     : image_(image), releaser_(releaser) {
   DCHECK(image_);
   DCHECK(releaser_);
 }
 
 RenderImage::~RenderImage() {}
 
 scoped_refptr<RenderImage> RenderImage::CreateFromMailboxTexture(
     const GLbyte mailbox_name[GL_MAILBOX_SIZE_CHROMIUM],
     GLuint sync_point,
     uint32_t width,
     uint32_t height,
     mojo::gfx::composition::MailboxTextureResource::Origin origin,
     const scoped_refptr<base::TaskRunner>& task_runner,
     const base::Closure& release_task) {
   scoped_refptr<Releaser> releaser = new Releaser(task_runner, release_task);
-  skia::RefPtr<SkImage> image = skia::AdoptRef(SkImage::NewFromGenerator(
+  sk_sp<SkImage> image = SkImage::MakeFromGenerator(
       new Generator(releaser, mailbox_name, sync_point, width, height,
                     origin == mojo::gfx::composition::MailboxTextureResource::
                                   Origin::BOTTOM_LEFT
                         ? kBottomLeft_GrSurfaceOrigin
-                        : kTopLeft_GrSurfaceOrigin)));
+                        : kTopLeft_GrSurfaceOrigin));
   if (!image)
     return nullptr;
 
   return new RenderImage(image, releaser);
 }
 
 }  // namespace compositor