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

chrome/renderer/print_web_view_helper_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/print_web_view_helper.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
@@ skipping 91 matching lines @@
   // Generate a memory-based metafile. It will use the current screen's DPI.
   // Each metafile contains a single page.
   scoped_ptr<Metafile> metafile(new printing::NativeMetafile);
   metafile->Init();
   DCHECK(metafile->context());
   skia::InitializeDC(metafile->context());
 
   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,
                             frame, metafile.get()));
 
   // Close the device context to retrieve the compiled metafile.
   if (!metafile->FinishDocument())
     NOTREACHED();
 
   // Get the size of the compiled metafile.
@@ skipping 15 matching lines @@
                                    &(page_params.metafile_data_handle))) {
     page_params.data_size = 0;
   }
 
   Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
 }
 
 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 =
       print_preview_context_.metafile();
 
   if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
     draft_metafile.reset(new printing::PreviewMetafile);
     initial_render_metafile = draft_metafile.get();
   }
 
@@ skipping 11 matching lines @@
   } else if (print_preview_context_.IsModifiable() &&
              print_preview_context_.generate_draft_pages()) {
     DCHECK(!draft_metafile.get());
     draft_metafile.reset(
         print_preview_context_.metafile()->GetMetafileForCurrentPage());
   }
   return PreviewPageRendered(page_number, draft_metafile.get());
 }
 
 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) {
     int dpi = static_cast<int>(params.dpi);
     int desired_dpi = printing::kPointsPerInch;
     width = ConvertUnit(params.page_size.width(), dpi, desired_dpi);
     height = ConvertUnit(params.page_size.height(), dpi, desired_dpi);
   } else {
     // Since WebKit extends the page width depending on the magical scale factor
     // we make sure the canvas covers the worst case scenario (x2.0 currently).
@@ skipping 123 matching lines @@
     shared_buf.Unmap();
     return false;
   }
   shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle);
   shared_buf.Unmap();
 
   Send(new PrintHostMsg_DuplicateSection(routing_id(), *shared_mem_handle,
                                          shared_mem_handle));
   return true;
 }