diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-27 18:24:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-28 02:26:02 +0000 |
| commit | e486004502c17ab80953ef324926a536b8030d1e (patch) | |
| tree | 9f51129a18a65823dfa8242491756a0697ea274a /printing | |
| parent | 03b487d118b5b1c0e5651a889cc56b443ba1d526 (diff) | |
| download | chromium_src-e486004502c17ab80953ef324926a536b8030d1e.zip chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.gz chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.bz2 | |
Global conversion of Pass()→std::move() on OS==linux
❆(੭ु ◜◡‾)੭ु⁾☃❆
BUG=557422
R=avi@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1550693002
Cr-Commit-Position: refs/heads/master@{#366956}
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/pdf_metafile_skia.cc | 6 | ||||
| -rw-r--r-- | printing/printed_document.cc | 5 | ||||
| -rw-r--r-- | printing/printed_page.cc | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index e68c0cf..04a8c40f 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -300,10 +300,10 @@ scoped_ptr<PdfMetafileSkia> PdfMetafileSkia::GetMetafileForCurrentPage() { scoped_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia); if (data_->pages_.size() == 0) - return metafile.Pass(); + return metafile; if (data_->recorder_.getRecordingCanvas()) // page outstanding - return metafile.Pass(); + return metafile; const Page& page = data_->pages_.back(); @@ -312,7 +312,7 @@ scoped_ptr<PdfMetafileSkia> PdfMetafileSkia::GetMetafileForCurrentPage() { if (!metafile->FinishDocument()) // Generate PDF. metafile.reset(); - return metafile.Pass(); + return metafile; } } // namespace printing diff --git a/printing/printed_document.cc b/printing/printed_document.cc index c231bef..472ebd5 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <set> #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -118,8 +119,8 @@ void PrintedDocument::SetPage(int page_number, const gfx::Rect& page_rect) { // Notice the page_number + 1, the reason is that this is the value that will // be shown. Users dislike 0-based counting. - scoped_refptr<PrintedPage> page( - new PrintedPage(page_number + 1, metafile.Pass(), paper_size, page_rect)); + scoped_refptr<PrintedPage> page(new PrintedPage( + page_number + 1, std::move(metafile), paper_size, page_rect)); #if defined(OS_WIN) page->set_shrink_factor(shrink); #endif // OS_WIN diff --git a/printing/printed_page.cc b/printing/printed_page.cc index 998f8be..2c3e7e8 100644 --- a/printing/printed_page.cc +++ b/printing/printed_page.cc @@ -4,6 +4,8 @@ #include "printing/printed_page.h" +#include <utility> + namespace printing { PrintedPage::PrintedPage(int page_number, @@ -11,7 +13,7 @@ PrintedPage::PrintedPage(int page_number, const gfx::Size& page_size, const gfx::Rect& page_content_rect) : page_number_(page_number), - metafile_(metafile.Pass()), + metafile_(std::move(metafile)), #if defined(OS_WIN) shrink_factor_(0.0f), #endif // OS_WIN |