Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6953)

Unified Diff: components/printing/renderer/print_render_frame_helper_mac.mm

Issue 2920013002: Use pdf compositor service for printing when OOPIF is enabled
Patch Set: rebase Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/printing/renderer/print_render_frame_helper_mac.mm
diff --git a/components/printing/renderer/print_render_frame_helper_mac.mm b/components/printing/renderer/print_render_frame_helper_mac.mm
index 4e46acfd553f07b9df68d98d3b83e8600840ee9f..6262aa8bcc5cb9821612e8d12ca0b38b5a1a0f13 100644
--- a/components/printing/renderer/print_render_frame_helper_mac.mm
+++ b/components/printing/renderer/print_render_frame_helper_mac.mm
@@ -45,7 +45,7 @@ void PrintRenderFrameHelper::PrintPagesInternal(
const std::vector<int>& printed_pages,
int page_count,
blink::WebLocalFrame* frame) {
- PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
+ PdfMetafileSkia metafile(params.printed_doc_type);
CHECK(metafile.Init());
gfx::Size page_size_in_dpi;
@@ -64,7 +64,7 @@ void PrintRenderFrameHelper::PrintPagesInternal(
// Ask the browser to create the shared memory for us.
if (!CopyMetafileDataToSharedMem(metafile,
- &(page_params.metafile_data_handle))) {
+ &page_params.metafile_data_handle)) {
// TODO(thestig): Fail and return false instead.
page_params.data_size = 0;
}
@@ -80,7 +80,6 @@ void PrintRenderFrameHelper::PrintPagesInternal(
bool PrintRenderFrameHelper::RenderPreviewPage(
int page_number,
const PrintMsg_Print_Params& print_params) {
- PrintMsg_Print_Params printParams = print_params;
std::unique_ptr<PdfMetafileSkia> draft_metafile;
PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
@@ -88,14 +87,14 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_;
if (render_to_draft) {
- draft_metafile.reset(new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
+ draft_metafile.reset(new PdfMetafileSkia(print_params.printed_doc_type));
CHECK(draft_metafile->Init());
initial_render_metafile = draft_metafile.get();
}
base::TimeTicks begin_time = base::TimeTicks::Now();
gfx::Size page_size;
- RenderPage(printParams, page_number,
+ RenderPage(print_params, page_number,
print_preview_context_.total_page_count(),
print_preview_context_.prepared_frame(), true,
initial_render_metafile, &page_size, NULL);
@@ -110,7 +109,7 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
DCHECK(!draft_metafile.get());
draft_metafile =
print_preview_context_.metafile()->GetMetafileForCurrentPage(
- PDF_SKIA_DOCUMENT_TYPE);
+ print_params.printed_doc_type);
}
}
return PreviewPageRendered(page_number, draft_metafile.get());

Powered by Google App Engine
This is Rietveld 408576698