Index: chrome/renderer/print_web_view_helper_linux.cc |
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc |
index 3df18beaedd04a630cdd3b0544b2a6b95f6f08bc..85c24126730bdc69f602cd8d8ef4d3c037e253c6 100644 |
--- a/chrome/renderer/print_web_view_helper_linux.cc |
+++ b/chrome/renderer/print_web_view_helper_linux.cc |
@@ -34,6 +34,7 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) { |
PrintPageInternal(page_params, |
print_preview_context_.GetPrintCanvasSize(), |
print_preview_context_.frame(), |
+ true, |
print_preview_context_.metafile()); |
print_preview_context_.RenderedPreviewPage( |
base::TimeTicks::Now() - begin_time); |
@@ -148,12 +149,12 @@ bool PrintWebViewHelper::RenderPages(const PrintMsg_PrintPages_Params& params, |
if (params.pages.empty()) { |
for (int i = 0; i < *page_count; ++i) { |
page_params.page_number = i; |
- PrintPageInternal(page_params, canvas_size, frame, metafile); |
+ PrintPageInternal(page_params, canvas_size, frame, false, metafile); |
} |
} else { |
for (size_t i = 0; i < params.pages.size(); ++i) { |
page_params.page_number = params.pages[i]; |
- PrintPageInternal(page_params, canvas_size, frame, metafile); |
+ PrintPageInternal(page_params, canvas_size, frame, false, metafile); |
} |
} |
@@ -168,6 +169,7 @@ void PrintWebViewHelper::PrintPageInternal( |
const PrintMsg_PrintPage_Params& params, |
const gfx::Size& canvas_size, |
WebFrame* frame, |
+ bool is_preview, |
printing::Metafile* metafile) { |
PageSizeMargins page_layout_in_points; |
GetPageSizeAndMarginsInPoints(frame, params.page_number, params.params, |
@@ -197,7 +199,13 @@ void PrintWebViewHelper::PrintPageInternal( |
printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile); |
frame->printPage(params.page_number, canvas.get()); |
- // TODO(myhuang): We should render the header and the footer. |
+ if (is_preview && params.params.display_header_footer) { |
+ // |page_number| is 0-based, so 1 is added. |
+ // The scale factor on Linux is 1. |
+ PrintHeaderAndFooter(device, *canvas, params.page_number + 1, |
+ print_preview_context_.total_page_count(), 1, |
+ page_layout_in_points, header_footer_info_); |
+ } |
// Done printing. Close the device context to retrieve the compiled metafile. |
if (!metafile->FinishPage()) |