Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

examples/ui/png_viewer/png_viewer.cc

 // Copyright 2014 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 <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
@@ skipping 12 matching lines @@
 
 namespace {
 constexpr uint32_t kContentImageResourceId = 1;
 constexpr uint32_t kRootNodeId = mojo::gfx::composition::kSceneRootNodeId;
 }  // namespace
 
 class PNGView : public mojo::ui::GaneshView {
  public:
   PNGView(mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector,
           mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
-          const skia::RefPtr<SkImage>& image)
+          const sk_sp<SkImage>& image)
       : GaneshView(app_connector.Pass(),
                    view_owner_request.Pass(),
                    "PNGViewer"),
         image_(image) {
     DCHECK(image_);
   }
 
   ~PNGView() override {}
 
  private:
@@ skipping 53 matching lines @@
     } else {
       w = image_->width() * size.height / image_->height();
       h = size.height;
     }
     canvas->drawImageRect(
         image_.get(), SkRect::MakeWH(image_->width(), image_->height()),
         SkRect::MakeXYWH((size.width - w) / 2, (size.height - h) / 2, w, h),
         nullptr);
   }
 
-  skia::RefPtr<SkImage> image_;
+  sk_sp<SkImage> image_;
 
   DISALLOW_COPY_AND_ASSIGN(PNGView);
 };
 
 class PNGContentViewProviderApp : public mojo::ui::ViewProviderApp {
  public:
-  PNGContentViewProviderApp(skia::RefPtr<SkImage> image) : image_(image) {
+  PNGContentViewProviderApp(sk_sp<SkImage> image) : image_(image) {
     DCHECK(image_);
   }
 
   ~PNGContentViewProviderApp() override {}
 
   void CreateView(
       const std::string& connection_url,
       mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
       mojo::InterfaceRequest<mojo::ServiceProvider> services) override {
     new PNGView(mojo::CreateApplicationConnector(app_impl()->shell()),
                 view_owner_request.Pass(), image_);
   }
 
  private:
-  skia::RefPtr<SkImage> image_;
+  sk_sp<SkImage> image_;
 
   DISALLOW_COPY_AND_ASSIGN(PNGContentViewProviderApp);
 };
 
 class PNGContentViewerApp : public mojo::ui::ContentViewerApp {
  public:
   PNGContentViewerApp() {}
 
   ~PNGContentViewerApp() override {}
 
   mojo::ui::ViewProviderApp* LoadContent(
       const std::string& content_handler_url,
       mojo::URLResponsePtr response) override {
     std::string data;
     mojo::common::BlockingCopyToString(response->body.Pass(), &data);
     SkBitmap bitmap;
     if (!::gfx::PNGCodec::Decode(
             reinterpret_cast<const unsigned char*>(data.data()), data.length(),
             &bitmap) ||
         bitmap.empty()) {
       LOG(ERROR) << "Could not decode PNG.";
       return nullptr;
     }
 
-    return new PNGContentViewProviderApp(
-        skia::AdoptRef(SkImage::NewFromBitmap(bitmap)));
+    return new PNGContentViewProviderApp(SkImage::MakeFromBitmap(bitmap));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PNGContentViewerApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new examples::PNGContentViewerApp());
   return runner.Run(application_request);
 }