diff options
| author | fmalita <fmalita@chromium.org> | 2016-03-22 06:32:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 13:33:15 +0000 |
| commit | 2d743288889c7804e6431bf389cdc6084aaa49ef (patch) | |
| tree | 95409a0d222e17f9e678b97040c0567ede58c4bc /printing/pdf_metafile_skia.cc | |
| parent | c2db76301d3eb61575d807d2897da86d637cbd34 (diff) | |
| download | chromium_src-2d743288889c7804e6431bf389cdc6084aaa49ef.zip chromium_src-2d743288889c7804e6431bf389cdc6084aaa49ef.tar.gz chromium_src-2d743288889c7804e6431bf389cdc6084aaa49ef.tar.bz2 | |
Use sk_sp-based picture recording APIs
1) use SkPictureRecorder::finishRecordingAsPicture() over
endRecordingAsPicture()
2) convert to sk_sp<SkPicture> fields/params where feasible
BUG=skia:5077
R=reed@google.com,danakj@chromium.org,enne@chromium.org
TBR=pdr@chromium.org,alekseys@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1819683002
Cr-Commit-Position: refs/heads/master@{#382563}
Diffstat (limited to 'printing/pdf_metafile_skia.cc')
| -rw-r--r-- | printing/pdf_metafile_skia.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index 6ba04c7..104970e 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -51,7 +51,7 @@ struct Page { SkSize page_size_; SkRect content_area_; float scale_factor_; - skia::RefPtr<SkPicture> content_; + sk_sp<SkPicture> content_; }; bool WriteAssetToBuffer(const SkStreamAsset* asset, @@ -144,7 +144,7 @@ bool PdfMetafileSkia::FinishPage() { return false; DCHECK(!(data_->pages_.back().content_)); data_->pages_.back().content_ = - skia::AdoptRef(data_->recorder_.endRecordingAsPicture()); + data_->recorder_.finishRecordingAsPicture(); return true; } @@ -173,7 +173,7 @@ bool PdfMetafileSkia::FinishDocument() { 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()) |