mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert "Revert "Add support for OOPIF printing in renderer""

Browse source 
https://chromium-review.googlesource.com/924566
This commit is contained in:
Aleksei Kuzmin 2018-04-11 16:59:05 +02:00 • committed by Samuel Attard
parent 93fc60720a
commit 7732da41ba
5 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -139,8 +139,7 @@ void PrintViewManagerBase::OnDidPrintPage(
} }
} }
std::unique_ptr<PdfMetafileSkia> metafile( auto metafile = std::make_unique<PdfMetafileSkia>();
new PdfMetafileSkia(SkiaDocumentType::PDF));
if (metafile_must_be_valid) { if (metafile_must_be_valid) {
if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) { if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
NOTREACHED() << "Invalid metafile header"; NOTREACHED() << "Invalid metafile header";

2
chromium_src/chrome/renderer/printing/print_web_view_helper.cc
View file

@ -1238,7 +1238,7 @@ bool PrintWebViewHelper::PrintPreviewContext::CreatePreviewDocument(
return false; return false;
} }
metafile_.reset(new PdfMetafileSkia(SkiaDocumentType::PDF)); metafile_.reset(new PdfMetafileSkia());
CHECK(metafile_->Init()); CHECK(metafile_->Init());
current_page_index_ = 0; current_page_index_ = 0;

4
chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
View file

@ -33,7 +33,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
std::unique_ptr<PdfMetafileSkia> draft_metafile; std::unique_ptr<PdfMetafileSkia> draft_metafile;
PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile(); PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) { if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
draft_metafile.reset(new PdfMetafileSkia(SkiaDocumentType::PDF)); draft_metafile.reset(new PdfMetafileSkia());
initial_render_metafile = draft_metafile.get(); initial_render_metafile = draft_metafile.get();
} }
@ -56,7 +56,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
bool PrintWebViewHelper::PrintPagesNative(blink::WebLocalFrame* frame, bool PrintWebViewHelper::PrintPagesNative(blink::WebLocalFrame* frame,
int page_count) { int page_count) {
PdfMetafileSkia metafile(SkiaDocumentType::PDF); PdfMetafileSkia metafile;
if (!metafile.Init()) if (!metafile.Init())
return false; return false;

4
chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
View file

@ -22,7 +22,7 @@ using blink::WebLocalFrame;
void PrintWebViewHelper::PrintPageInternal( void PrintWebViewHelper::PrintPageInternal(
const PrintMsg_PrintPage_Params& params, const PrintMsg_PrintPage_Params& params,
WebLocalFrame* frame) { WebLocalFrame* frame) {
PdfMetafileSkia metafile(SkiaDocumentType::PDF); PdfMetafileSkia metafile;
CHECK(metafile.Init()); CHECK(metafile.Init());
int page_number = params.page_number; int page_number = params.page_number;
@ -60,7 +60,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_; print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_;
if (render_to_draft) { if (render_to_draft) {
draft_metafile.reset(new PdfMetafileSkia(SkiaDocumentType::PDF)); draft_metafile.reset(new PdfMetafileSkia());
CHECK(draft_metafile->Init()); CHECK(draft_metafile->Init());
initial_render_metafile = draft_metafile.get(); initial_render_metafile = draft_metafile.get();
} }

4
chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
View file

@ -29,7 +29,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
std::unique_ptr<PdfMetafileSkia> draft_metafile; std::unique_ptr<PdfMetafileSkia> draft_metafile;
PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile(); PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) { if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
draft_metafile.reset(new PdfMetafileSkia(SkiaDocumentType::PDF)); draft_metafile.reset(new PdfMetafileSkia());
initial_render_metafile = draft_metafile.get(); initial_render_metafile = draft_metafile.get();
} }
@ -52,7 +52,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
bool PrintWebViewHelper::PrintPagesNative(blink::WebLocalFrame* frame, bool PrintWebViewHelper::PrintPagesNative(blink::WebLocalFrame* frame,
int page_count) { int page_count) {
PdfMetafileSkia metafile(SkiaDocumentType::PDF); PdfMetafileSkia metafile;
if (!metafile.Init()) if (!metafile.Init())
return false; return false;