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

chrome/renderer/print_web_view_helper_linux.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/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 129 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 }
 
 bool PrintWebViewHelper::RenderPages(const PrintMsg_PrintPages_Params& params,
                                      WebKit::WebFrame* frame,
                                      const WebKit::WebNode& node,
                                      int* page_count,
                                      PrepareFrameAndViewForPrint* prepare,
                                      printing::Metafile* metafile) {
   PrintMsg_Print_Params print_params = params.params;
-  UpdatePrintableSizeInPrintParameters(frame, node, prepare, &print_params);
+  UpdatePrintableSizeInPrintParameters(frame, node, prepare, &print_params,
+                                       default_margins_requested_);
 
   *page_count = prepare->GetExpectedPageCount();
   if (!*page_count)
     return false;
 
 #if !defined(OS_CHROMEOS)
     Send(new PrintHostMsg_DidGetPrintedPagesCount(routing_id(),
                                                   print_params.document_cookie,
                                                   *page_count));
 #endif
@@ skipping 18 matching lines @@
   return true;
 }
 
 void PrintWebViewHelper::PrintPageInternal(
     const PrintMsg_PrintPage_Params& params,
     const gfx::Size& canvas_size,
     WebFrame* frame,
     printing::Metafile* metafile) {
   printing::PageSizeMargins page_layout_in_points;
   GetPageSizeAndMarginsInPoints(frame, params.page_number, params.params,
-                                &page_layout_in_points);
+                                &page_layout_in_points,
+                                default_margins_requested_);
 
   gfx::Size page_size(
       page_layout_in_points.content_width +
           page_layout_in_points.margin_right +
           page_layout_in_points.margin_left,
       page_layout_in_points.content_height +
           page_layout_in_points.margin_top +
           page_layout_in_points.margin_bottom);
   gfx::Rect content_area(page_layout_in_points.margin_left,
                          page_layout_in_points.margin_top,
@@ skipping 18 matching lines @@
     // The scale factor on Linux is 1.
     PrintHeaderAndFooter(canvas.get(), 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())
     NOTREACHED() << "metafile failed";
 }