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

Unified Diff: chrome/renderer/print_web_view_helper_mac.mm

Issue 11359020: Print headers and footers with WebKit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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: chrome/renderer/print_web_view_helper_mac.mm
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index 7c62839e5d80f78e6d721b5156e8213907b3abc4..e74739bd4add963e97ac7f496f7771ddbfbb6a08 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -112,9 +112,13 @@ void PrintWebViewHelper::RenderPage(
*content_rect = content_area;
scale_factor *= webkit_shrink_factor;
+
+ gfx::Rect canvas_area =
+ params.display_header_footer ? gfx::Rect(*page_size) : content_area;
+
{
SkDevice* device = metafile->StartPageForVectorCanvas(
- *page_size, content_area, scale_factor);
+ *page_size, canvas_area, scale_factor);
if (!device)
return;
@@ -125,15 +129,14 @@ void PrintWebViewHelper::RenderPage(
skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
skia::SetIsPreviewMetafile(*canvas, is_preview);
- frame->printPage(page_number, canvas_ptr);
-
if (print_pages_params_->params.display_header_footer) {
- // |page_number| is 0-based, so 1 is added.
PrintHeaderAndFooter(canvas_ptr, page_number + 1,
print_preview_context_.total_page_count(),
scale_factor, page_layout_in_points,
*header_footer_info_, params);
}
+ RenderPageContent(frame, page_number, canvas_area, content_area,
+ scale_factor, canvas_ptr);
}
// Done printing. Close the device context to retrieve the compiled metafile.

Powered by Google App Engine
This is Rietveld 408576698