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

chrome/renderer/print_web_view_helper.h

 // 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.
 
 #ifndef CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 #define CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 99 matching lines @@
   virtual void PrintPage(WebKit::WebFrame* frame);
 
   // Message handlers ---------------------------------------------------------
 
   // Print the document.
   void OnPrintPages();
 
   // Print the document with the print preview frame/node.
   void OnPrintForSystemDialog();
 
+  // Update |default_margins_requested_| based on settings.
+  void UpdateDefaultMarginsRequested(const base::DictionaryValue& settings);
+
   // Initiate print preview.
   void OnInitiatePrintPreview();
 
   // Start the process of generating a print preview using |settings|.
   void OnPrintPreview(const base::DictionaryValue& settings);
 
   // Initialize the print preview document.
   bool CreatePreviewDocument();
 
   // Renders a print preview page. |page_number| is 0-based.
@@ skipping 106 matching lines @@
 
   bool CopyAndPrint(WebKit::WebFrame* web_frame);
 
   bool CopyMetafileDataToSharedMem(printing::Metafile* metafile,
                                    base::SharedMemoryHandle* shared_mem_handle);
 
   static void GetPageSizeAndMarginsInPoints(
       WebKit::WebFrame* frame,
       int page_index,
       const PrintMsg_Print_Params& default_params,
-      printing::PageSizeMargins* page_layout_in_points);
+      printing::PageSizeMargins* page_layout_in_points,
+      bool default_margins_requested);
 
   static void UpdatePrintableSizeInPrintParameters(
       WebKit::WebFrame* frame,
       const WebKit::WebNode& node,
       PrepareFrameAndViewForPrint* prepare,
-      PrintMsg_Print_Params* params);
+      PrintMsg_Print_Params* params,
+      bool default_margins_requested);

[vandebo (ex-Chrome), 2011/11/17 23:05:23]

No need to pass this down, just access the member var.

[kmadhusu, 2011/12/01 02:15:42]

This is a static function.

[kmadhusu, 2011/12/01 02:15:42]

(as we discussed) I am ignoring this comment.

 
   // Given the |device| and |canvas| to draw on, prints the appropriate headers
   // and footers using strings from |header_footer_info| on to the canvas.
   static void PrintHeaderAndFooter(
       WebKit::WebCanvas* canvas,
       int page_number,
       int total_pages,
       float webkit_scale_factor,
       const printing::PageSizeMargins& page_layout_in_points,
       const base::DictionaryValue& header_footer_info);
@@ skipping 30 matching lines @@
   // For a valid |page_number| with modifiable content,
   // |metafile| is the rendered page. Otherwise |metafile| is NULL.
   // Returns true if print preview should continue, false on failure.
   bool PreviewPageRendered(int page_number, printing::Metafile* metafile);
 
   WebKit::WebView* print_web_view_;
 
   scoped_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
   bool is_preview_enabled_;
   bool is_print_ready_metafile_sent_;
+  bool default_margins_requested_;

[vandebo (ex-Chrome), 2011/11/17 23:05:23]

Should this go in PrintPreviewContext since it's only used for PP?

[kmadhusu, 2011/12/01 02:15:42]

(as we discussed) I am ignoring this comment.

 
   // Used for scripted initiated printing blocking.
   base::Time last_cancelled_script_print_;
   int user_cancelled_scripted_print_count_;
 
   // Let the browser process know of a printing failure. Only set to false when
   // the failure came from the browser in the first place.
   bool notify_browser_of_print_failure_;
 
   scoped_ptr<PrintMsg_PrintPages_Params> old_print_pages_params_;
@@ skipping 24 matching lines @@
     // Initializes the print preview context. Need to be called to set
     // the |web_frame| / |web_node| to generate the print preview for.
     void InitWithFrame(WebKit::WebFrame* web_frame);
     void InitWithNode(const WebKit::WebNode& web_node);
 
     // Does bookkeeping at the beginning of print preview.
     void OnPrintPreview();
 
     // Create the print preview document. |pages| is empty to print all pages.
     bool CreatePreviewDocument(PrintMsg_Print_Params* params,
-                               const std::vector<int>& pages);
+                               const std::vector<int>& pages,
+                               bool default_margins_requested);

[vandebo (ex-Chrome), 2011/11/17 23:05:23]

No need to pass this down, just access the member var.

[kmadhusu, 2011/12/01 02:15:42]

(as we discussed) I am ignoring this comment.

 
     // Called after a page gets rendered. |page_time| is how long the
     // rendering took.
     void RenderedPreviewPage(const base::TimeDelta& page_time);
 
     // Updates the print preview context when the required pages are rendered.
     void AllPagesRendered();
 
     // Finalizes the print ready preview document.
     void FinalizePrintReadyDocument();
@@ skipping 66 matching lines @@
 
     State state_;
   };
 
   PrintPreviewContext print_preview_context_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
 };
 
 #endif  // CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_