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

Unified Diff: chrome/renderer/print_web_view_helper_mac.mm

Issue 7348010: Added Header and Footer support using Skia (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Remove header_footer_info from settings Dictionary. Changes as per Steve and Kausalya's comments. Created 9 years, 5 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: 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 3ceeb5d92ed139c98ab8aa71619b45df4d320612..a5d269c5be77ee24b4d947be8124f1bdf89ca9e9 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -36,6 +36,7 @@ void PrintWebViewHelper::PrintPageInternal(
// Render page for printing.
gfx::Rect content_area(params.params.printable_size);
+ params.display_header_footer = false;
RenderPage(params.params.printable_size, content_area, scale_factor,
page_number, page_slot, frame, &metafile);
metafile.FinishDocument();
@@ -138,7 +139,20 @@ void PrintWebViewHelper::RenderPage(
CGContextRef cgContext = metafile->context();
CGContextRef canvasPtr = cgContext;
#endif
- frame->printPage(page_number, canvasPtr);
+ float webkit_scale_factor = frame->printPage(page_number, canvasPtr);
+#if defined(USE_SKIA)
+ PrintMsg_Print_Params printParams = print_preview_context_.print_params();
+ if (printParams.display_header_footer) {
+ PageSizeMargins page_layout_in_points;
+ GetPageSizeAndMarginsInPoints(frame, page_number, printParams,
+ &page_layout_in_points);
+ // |page_number| is 0-based, so 1 is added.
+ PrintHeaderAndFooter(device, canvas.get(), page_number + 1,
+ print_preview_context_.total_page_count(),
+ webkit_scale_factor, page_layout_in_points,
+ *header_footer_info_);
+ }
+#endif // USE_SKIA
}
// Done printing. Close the device context to retrieve the compiled metafile.

Powered by Google App Engine
This is Rietveld 408576698