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

Unified Diff: chrome/renderer/print_web_view_helper_win.cc

Issue 7348010: Added Header and Footer support using Skia (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Indent Fix 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_win.cc
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 9528797a7950dcd57c3784a829e3444fb916f4ad..b1b2de7394765cfbfb1d8a1fa31ab785922ba181 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -214,15 +214,7 @@ bool PrintWebViewHelper::CreatePreviewDocument(
void PrintWebViewHelper::RenderPage(
const PrintMsg_Print_Params& params, float* scale_factor, int page_number,
bool is_preview, WebFrame* frame, scoped_ptr<Metafile>* metafile) {
- double content_width_in_points;
- double content_height_in_points;
- double margin_top_in_points;
- double margin_left_in_points;
- GetPageSizeAndMarginsInPoints(frame, page_number, params,
- &content_width_in_points,
- &content_height_in_points,
- &margin_top_in_points, NULL, NULL,
- &margin_left_in_points);
+ GetPageSizeAndMarginsInPoints(frame, page_number, params);
int width;
int height;
@@ -257,6 +249,13 @@ void PrintWebViewHelper::RenderPage(
}
float webkit_scale_factor = frame->printPage(page_number, canvas.get());
+
+ if (is_preview && params.header_footer) {
+ // The page_number count starts from '0', so, we add by '1'.
+ PrintHeaderAndFooter(device, canvas, page_number+1, preview_page_count_,
kmadhusu 2011/07/14 01:50:15 nit: add space before and after '+'.
Aayush Kumar 2011/07/19 01:20:30 Done.
+ webkit_scale_factor);
+ }
+
if (*scale_factor <= 0 || webkit_scale_factor <= 0) {
NOTREACHED() << "Printing page " << page_number << " failed.";
} else {

Powered by Google App Engine
This is Rietveld 408576698