| 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 8c6dad96e3268ae5d5a56d4fa4c2db015fef6fbc..5599a12357da60851f44460552293eb401050d6b 100644
|
| --- a/chrome/renderer/print_web_view_helper_linux.cc
|
| +++ b/chrome/renderer/print_web_view_helper_linux.cc
|
| @@ -34,7 +34,8 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
|
| PrintPageInternal(page_params,
|
| print_preview_context_.GetPrintCanvasSize(),
|
| print_preview_context_.frame(),
|
| - print_preview_context_.metafile());
|
| + print_preview_context_.metafile(),
|
| + true);
|
| print_preview_context_.RenderedPreviewPage(
|
| base::TimeTicks::Now() - begin_time);
|
| PreviewPageRendered(page_number);
|
| @@ -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, metafile, false);
|
| }
|
| } 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, metafile, false);
|
| }
|
| }
|
|
|
| @@ -168,30 +169,23 @@ void PrintWebViewHelper::PrintPageInternal(
|
| const PrintMsg_PrintPage_Params& params,
|
| const gfx::Size& canvas_size,
|
| WebFrame* frame,
|
| - printing::Metafile* metafile) {
|
| - double content_width_in_points;
|
| - double content_height_in_points;
|
| - double margin_top_in_points;
|
| - double margin_right_in_points;
|
| - double margin_bottom_in_points;
|
| - double margin_left_in_points;
|
| - GetPageSizeAndMarginsInPoints(frame,
|
| - params.page_number,
|
| - params.params,
|
| - &content_width_in_points,
|
| - &content_height_in_points,
|
| - &margin_top_in_points,
|
| - &margin_right_in_points,
|
| - &margin_bottom_in_points,
|
| - &margin_left_in_points);
|
| + printing::Metafile* metafile,
|
| + bool is_preview) {
|
| + PageSizeMargins page_size_margins_in_points =
|
| + GetPageSizeAndMarginsInPoints(frame, params.page_number, params.params);
|
|
|
| gfx::Size page_size(
|
| - content_width_in_points + margin_right_in_points +
|
| - margin_left_in_points,
|
| - content_height_in_points + margin_top_in_points +
|
| - margin_bottom_in_points);
|
| - gfx::Rect content_area(margin_left_in_points, margin_top_in_points,
|
| - content_width_in_points, content_height_in_points);
|
| + page_size_margins_in_points.content_width +
|
| + page_size_margins_in_points.margin_right +
|
| + page_size_margins_in_points.margin_left,
|
| + page_size_margins_in_points.content_height +
|
| + page_size_margins_in_points.margin_top +
|
| + page_size_margins_in_points.margin_bottom);
|
| +
|
| + gfx::Rect content_area(page_size_margins_in_points.margin_left,
|
| + page_size_margins_in_points.margin_top,
|
| + page_size_margins_in_points.content_width,
|
| + page_size_margins_in_points.content_height);
|
|
|
| SkDevice* device = metafile->StartPageForVectorCanvas(
|
| page_size, content_area, 1.0f);
|
| @@ -203,9 +197,17 @@ void PrintWebViewHelper::PrintPageInternal(
|
| SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
|
| canvas->unref(); // SkRefPtr and new both took a reference.
|
| 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) {
|
| + // The page_number count starts from 0, so we add 1.
|
| + // The scale factor on Linux is 1.
|
| + PrintHeaderAndFooter(static_cast<skia::VectorPlatformDeviceSkia*>(device),
|
| + canvas, params.page_number + 1,
|
| + print_preview_context_.total_page_count(), 1,
|
| + page_size_margins_in_points, header_footer_info_);
|
| + }
|
|
|
| // Done printing. Close the device context to retrieve the compiled metafile.
|
| if (!metafile->FinishPage())
|
|
|