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

Unified Diff: chrome/renderer/print_web_view_helper_linux.cc

Issue 7348010: Added Header and Footer support using Skia (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Style changes as per Kausalya and Demetrios' 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_linux.cc
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index 27667d63c2afc8fe5c9f8943500504bfc04ee119..f89fa14e8c650cc903a64fe8c05d57db4c5ad3f5 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -36,6 +36,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(
@@ -163,13 +164,13 @@ bool PrintWebViewHelper::RenderPages(const PrintMsg_PrintPages_Params& params,
for (int i = 0; i < *page_count; ++i) {
page_params.page_number = i;
page_params.page_slot = i;
- PrintPageInternal(page_params, canvas_size, frame, metafile);
+ PrintPageInternal(page_params, canvas_size, frame, false, metafile);
vandebo (ex-Chrome) 2011/08/01 21:07:37 Instead of changing the signature of this method,
Aayush Kumar 2011/08/02 00:18:13 Done.
}
} else {
for (size_t i = 0; i < params.pages.size(); ++i) {
page_params.page_number = params.pages[i];
page_params.page_slot = i;
- PrintPageInternal(page_params, canvas_size, frame, metafile);
+ PrintPageInternal(page_params, canvas_size, frame, false, metafile);
}
}
@@ -184,6 +185,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,
@@ -213,7 +215,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())

Powered by Google App Engine
This is Rietveld 408576698