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) OVERRIDE;
 
   // Message handlers ---------------------------------------------------------
 
   // Print the document.
   void OnPrintPages();
 
   // Print the document with the print preview frame/node.
   void OnPrintForSystemDialog();
 
+  // Update |ignore_frame_margins_css_| based on settings.
+  void UpdateFrameMarginsCssInfo(const base::DictionaryValue& settings);
+
+  // Returns true if the current destination printer is PRINT_TO_PDF.
+  bool IsPrintToPdfRequested(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 79 matching lines @@
   bool RenderPagesForPrint(WebKit::WebFrame* frame,
                            const WebKit::WebNode& node);
 
   // Platform specific helper function for rendering page(s) to |metafile|.
 #if defined(OS_WIN)
   // Because of mixed support for alpha channels on printers, this method may
   // need to create a new metafile.  The result may be either the passed
   // |metafile| or a new one.  In either case, the caller owns both |metafile|
   // and the result.
   printing::Metafile* RenderPage(const PrintMsg_Print_Params& params,
-                                 float* scale_factor, int page_number,
+                                 double* scale_factor, int page_number,
                                  bool is_preview, WebKit::WebFrame* frame,
                                  printing::Metafile* metafile);
 #elif defined(OS_MACOSX)
   void RenderPage(const gfx::Size& page_size, const gfx::Rect& content_area,
-                  const float& scale_factor, int page_number,
+                  const double& scale_factor, int page_number,
                   WebKit::WebFrame* frame, bool is_preview,
-                  printing::Metafile* metafile);
+                  printing::Metafile* metafile,
+                  printing::PageSizeMargins page_layout_in_points);
 #elif defined(OS_POSIX)
   bool RenderPages(const PrintMsg_PrintPages_Params& params,
                    WebKit::WebFrame* frame, const WebKit::WebNode& node,
                    int* page_count, PrepareFrameAndViewForPrint* prepare,
                    printing::Metafile* metafile);
 #endif  // defined(OS_WIN)
 
   // Helper methods -----------------------------------------------------------
 
   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,
+      bool ignore_frame_margins_css,
+      bool fit_to_page,
+      double* scale_factor,
       printing::PageSizeMargins* page_layout_in_points);
 
   static void UpdatePrintableSizeInPrintParameters(

[vandebo (ex-Chrome), 2011/12/04 22:20:34]

The name of this function now needs to be changed....
UpdatePageSizeAndMarginsInFrameAndView ?

[kmadhusu, 2011/12/05 09:06:54]

Done.

       WebKit::WebFrame* frame,
       const WebKit::WebNode& node,
       PrepareFrameAndViewForPrint* prepare,
-      PrintMsg_Print_Params* params);
+      const PrintMsg_Print_Params& params,
+      bool ignore_frame_margins_css,
+      bool fit_to_page);
 
   // 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 ignore_frame_margins_css_;

[vandebo (ex-Chrome), 2011/12/04 22:20:34]

nit: ignore_frame_css_margins_ or just ignore_css_margins_ ?

[kmadhusu, 2011/12/05 09:06:54]

Done. (ignore_frame_margins_css_ => ignore_css_margins_)

+
+  // True if we need to auto fit to page else false.
+  // NOTE: When we print to pdf, we don't fit to page.
+  bool fit_to_page_;
 
   // 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 ignore_frame_margins_css,
+                               bool fit_to_page);
 
     // 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_