PrintPreview: Honor the print media page size and margin values.

chrome/renderer/print_web_view_helper_win.cc

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 08b6bed88b9da5c34538dc8c3e403623fd9ac0dc..a60e7e6f2901987108a16451c188354b37709ee0 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -109,8 +109,8 @@ void PrintWebViewHelper::PrintPageInternal(
   int page_number = params.page_number;
 
   // Calculate the dpi adjustment.
-  float scale_factor = static_cast<float>(params.params.desired_dpi /
-                                          params.params.dpi);
+  double scale_factor = static_cast<float>(params.params.desired_dpi /
+                                           params.params.dpi);
 
   // Render page for printing.
   metafile.reset(RenderPage(params.params, &scale_factor, page_number, false,
@@ -146,7 +146,7 @@ void PrintWebViewHelper::PrintPageInternal(
 bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
   PrintMsg_Print_Params print_params = print_preview_context_.print_params();
   // Calculate the dpi adjustment.
-  float scale_factor = static_cast<float>(print_params.desired_dpi /
+  double scale_factor = static_cast<float>(print_params.desired_dpi /
                                           print_params.dpi);
   scoped_ptr<Metafile> draft_metafile;
   printing::Metafile* initial_render_metafile =
@@ -178,12 +178,12 @@ bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
 }
 
 Metafile* PrintWebViewHelper::RenderPage(
-    const PrintMsg_Print_Params& params, float* scale_factor, int page_number,
+    const PrintMsg_Print_Params& params, double* scale_factor, int page_number,
     bool is_preview, WebFrame* frame, Metafile* metafile) {
   printing::PageSizeMargins page_layout_in_points;
   GetPageSizeAndMarginsInPoints(frame, page_number, params,
-                                &page_layout_in_points);
-
+                                ignore_frame_margins_css_, fit_to_page_,
+                                scale_factor, &page_layout_in_points);
   int width;
   int height;
   if (is_preview) {