Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

examples/ui/pdf_viewer/pdf_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 <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 30 matching lines @@
               const std::string& data)
       : pdf_library_(pdf_library),
         doc_(doc),
         data_(data),
         page_count_(FPDF_GetPageCount(doc_)) {}
 
   ~PDFDocument() { FPDF_CloseDocument(doc_); }
 
   uint32_t page_count() { return page_count_; }
 
-  skia::RefPtr<SkImage> DrawPage(int page_index, const mojo::Size& size) {
+  sk_sp<SkImage> DrawPage(int page_index, const mojo::Size& size) {
     FPDF_PAGE page = FPDF_LoadPage(doc_, page_index);
 
     double width_pts = FPDF_GetPageWidth(page);
     double height_pts = FPDF_GetPageHeight(page);
 
     int width, height;
     if (size.width * height_pts < size.height * width_pts) {
       width = size.width;
       height = height_pts * size.width / width_pts;
     } else {
       width = width_pts * size.height / height_pts;
       height = size.height;
     }
 
     int stride = width * 4;
-    skia::RefPtr<SkData> pixels =
-        skia::AdoptRef(SkData::NewUninitialized(stride * height));
+    sk_sp<SkData> pixels = SkData::MakeUninitialized(stride * height);
     DCHECK(pixels);
 
     FPDF_BITMAP bitmap = FPDFBitmap_CreateEx(width, height, FPDFBitmap_BGRA,
                                              pixels->writable_data(), stride);
     FPDFBitmap_FillRect(bitmap, 0, 0, width, height, 0xFFFFFFFF);
     FPDF_RenderPageBitmap(bitmap, page, 0, 0, width, height, 0, 0);
     FPDFBitmap_Destroy(bitmap);
 
     FPDF_ClosePage(page);
 
     SkImageInfo info = SkImageInfo::Make(width, height, kBGRA_8888_SkColorType,
                                          kOpaque_SkAlphaType);
-    return skia::AdoptRef(SkImage::NewRasterData(info, pixels.get(), stride));
+    return SkImage::MakeRasterData(info, pixels, stride);
   }
 
  private:
   std::shared_ptr<PDFLibrary> pdf_library_;
   FPDF_DOCUMENT doc_;
   std::string data_;
   uint32_t page_count_;
 };
 
 class PDFLibrary : public std::enable_shared_from_this<PDFLibrary> {
@@ skipping 145 matching lines @@
   }
 
   void GotoPreviousPage() {
     if (page_ > 0) {
       page_--;
       Redraw();
     }
   }
 
   void Redraw() {
-    cached_image_.clear();
+    cached_image_.reset();
     choreographer_.ScheduleDraw();
   }
 
   std::shared_ptr<PDFDocument> pdf_document_;
   uint32_t page_ = 0u;
-  skia::RefPtr<SkImage> cached_image_;
+  sk_sp<SkImage> cached_image_;
 
   mojo::ui::Choreographer choreographer_;
   mojo::ui::InputHandler input_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFDocumentView);
 };
 
 class PDFContentViewProviderApp : public mojo::ui::ViewProviderApp {
  public:
   PDFContentViewProviderApp(const std::shared_ptr<PDFLibrary>& pdf_library,
@@ skipping 44 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PDFContentViewerApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new examples::PDFContentViewerApp());
   return runner.Run(application_request);
 }