Use sk_sp-based picture recording APIs

printing/pdf_metafile_skia.cc

 // Copyright (c) 2012 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 "printing/pdf_metafile_skia.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/containers/hash_tables.h"
@@ skipping 33 matching lines @@
 // page into a SkDocument.
 struct Page {
   Page(const SkSize& page_size, const SkRect& content_area, float scale)
       : page_size_(page_size),
         content_area_(content_area),
         scale_factor_(scale),
         content_(/*NULL*/) {}
   SkSize page_size_;
   SkRect content_area_;
   float scale_factor_;
-  skia::RefPtr<SkPicture> content_;
+  sk_sp<SkPicture> content_;
 };
 
 bool WriteAssetToBuffer(const SkStreamAsset* asset,
                         void* buffer,
                         size_t size) {
   // Calling duplicate() keeps original asset state unchanged.
   scoped_ptr<SkStreamAsset> assetCopy(asset->duplicate());
   size_t length = assetCopy->getLength();
   if (length > size)
     return false;
@@ skipping 72 matching lines @@
   if (!StartPage(page_size, content_area, scale_factor))
     return nullptr;
   return data_->recorder_.getRecordingCanvas();
 }
 
 bool PdfMetafileSkia::FinishPage() {
   if (!data_->recorder_.getRecordingCanvas())
     return false;
   DCHECK(!(data_->pages_.back().content_));
   data_->pages_.back().content_ =
-      skia::AdoptRef(data_->recorder_.endRecordingAsPicture());
+      data_->recorder_.finishRecordingAsPicture();
   return true;
 }
 
 bool PdfMetafileSkia::FinishDocument() {
   // If we've already set the data in InitFromData, leave it be.
   if (data_->pdf_data_)
     return false;
 
   if (data_->recorder_.getRecordingCanvas())
     FinishPage();
 
   SkDynamicMemoryWStream pdf_stream;
   skia::RefPtr<SkDocument> pdf_doc =
       skia::AdoptRef(SkDocument::CreatePDF(&pdf_stream));
   const std::string& user_agent = GetAgent();
   SkDocument::Attribute info[] = {
       SkDocument::Attribute(SkString("Creator"),
                             user_agent.empty()
                             ? SkString("Chromium")
                             : SkString(user_agent.c_str(), user_agent.size())),
   };
   SkTime::DateTime now = TimeToSkTime(base::Time::Now());
   pdf_doc->setMetadata(info, SK_ARRAY_COUNT(info), &now, &now);
   for (const auto& page : data_->pages_) {
     SkCanvas* canvas = pdf_doc->beginPage(
         page.page_size_.width(), page.page_size_.height(), &page.content_area_);
     // No need to save/restore, since this canvas is not reused after endPage()
     canvas->scale(page.scale_factor_, page.scale_factor_);
-    canvas->drawPicture(page.content_.get());
+    canvas->drawPicture(page.content_);
     pdf_doc->endPage();
   }
   if (!pdf_doc->close())
     return false;
 
   data_->pdf_data_.reset(pdf_stream.detachAsStream());
   return true;
 }
 
 uint32_t PdfMetafileSkia::GetDataSize() const {
@@ skipping 124 matching lines @@
 
   metafile->data_->pages_.push_back(page);
 
   if (!metafile->FinishDocument())  // Generate PDF.
     metafile.reset();
 
   return metafile;
 }
 
 }  // namespace printing