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

Unified Diff: chrome/renderer/print_web_view_helper.cc

Issue 7794024: Merge 98772 - Fix regression in printing page settings CSS properties. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/print_web_view_helper.cc
===================================================================
--- chrome/renderer/print_web_view_helper.cc (revision 98831)
+++ chrome/renderer/print_web_view_helper.cc (working copy)
@@ -653,7 +653,6 @@
PrepareFrameAndViewForPrint* prepare,
PrintMsg_Print_Params* params) {
PageSizeMargins page_layout_in_points;
- prepare->UpdatePrintParams(*params);
PrintWebViewHelper::GetPageSizeAndMarginsInPoints(frame, 0, *params,
&page_layout_in_points);
int dpi = GetDPI(params);
@@ -684,6 +683,8 @@
page_layout_in_points.margin_top, printing::kPointsPerInch, dpi));
params->margin_left = static_cast<int>(ConvertUnitDouble(
page_layout_in_points.margin_left, printing::kPointsPerInch, dpi));
+
+ prepare->UpdatePrintParams(*params);
}
bool PrintWebViewHelper::InitPrintSettings(WebKit::WebFrame* frame,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698