Cleanup of PrepareFrameAndViewForPrint code.

chrome/renderer/printing/print_web_view_helper.h

 // Copyright (c) 2012 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_PRINTING_PRINT_WEB_VIEW_HELPER_H_
 #define CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 19 matching lines @@
 }
 
 namespace WebKit {
 class WebFrame;
 class WebView;
 }
 
 namespace printing {
 
 struct PageSizeMargins;
-
-// Class that calls the Begin and End print functions on the frame and changes
-// the size of the view temporarily to support full page printing..
-// Do not serve any events in the time between construction and destruction of
-// this class because it will cause flicker.
-class PrepareFrameAndViewForPrint {
- public:
-  // Prints |frame|.  If |node| is not NULL, then only that node will be
-  // printed.
-  PrepareFrameAndViewForPrint(const PrintMsg_Print_Params& print_params,
-                              WebKit::WebFrame* frame,
-                              const WebKit::WebNode& node);
-  ~PrepareFrameAndViewForPrint();
-
-  void UpdatePrintParams(const PrintMsg_Print_Params& print_params);
-
-  int GetExpectedPageCount() const {
-    return expected_pages_count_;
-  }
-
-  bool ShouldUseBrowserOverlays() const {
-    return use_browser_overlays_;
-  }
-
-  gfx::Size GetPrintCanvasSize() const;
-
-  void FinishPrinting();
-
- private:
-  void StartPrinting(const WebKit::WebPrintParams& webkit_print_params);
-
-  WebKit::WebFrame* frame_;
-  WebKit::WebNode node_to_print_;
-  WebKit::WebView* web_view_;
-  WebKit::WebPrintParams web_print_params_;
-  gfx::Size prev_view_size_;
-  gfx::Size prev_scroll_offset_;
-  int expected_pages_count_;
-  bool use_browser_overlays_;
-  bool finished_;
-  bool should_print_backgrounds_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrepareFrameAndViewForPrint);
-};
+class PrepareFrameAndViewForPrint;
 
 // PrintWebViewHelper handles most of the printing grunt work for RenderView.
 // We plan on making print asynchronous and that will require copying the DOM
 // of the document and creating a new WebView with the contents.
 class PrintWebViewHelper
     : public content::RenderViewObserver,
       public content::RenderViewObserverTracker<PrintWebViewHelper>,
       public WebKit::WebViewClient,
       public WebKit::WebFrameClient {
  public:
@@ skipping 125 matching lines @@
 
   // Notification when printing is done - signal tear-down/free resources.
   void DidFinishPrinting(PrintingResult result);
 
   // Print Settings -----------------------------------------------------------
 
   // Initialize print page settings with default settings.
   // Used only for native printing workflow.
   bool InitPrintSettings(bool fit_to_paper_size);
 
-  // Initialize print page settings with default settings and prepare the frame
-  // for print. A new PrepareFrameAndViewForPrint is created to fulfill the
-  // request and is filled into the |prepare| argument.
-  // Used only for native printing workflow.
-  bool InitPrintSettingsAndPrepareFrame(
-      WebKit::WebFrame* frame,
-      const WebKit::WebNode& node,
-      scoped_ptr<PrepareFrameAndViewForPrint>* prepare);
+  // Calculate number of pages in source document.
+  bool CalculateNumberOfPages(WebKit::WebFrame* frame,
+                              const WebKit::WebNode& node,
+                              int* number_of_pages);
 
   // Update the current print settings with new |passed_job_settings|.
   // |passed_job_settings| dictionary contains print job details such as printer
   // name, number of copies, page range, etc.
   bool UpdatePrintSettings(WebKit::WebFrame* frame,
                            const WebKit::WebNode& node,
                            const base::DictionaryValue& passed_job_settings);
 
   // Get final print settings from the user.
   // Return false if the user cancels or on error.
   bool GetPrintSettingsFromUser(WebKit::WebFrame* frame,
                                 const WebKit::WebNode& node,
-                                int expected_pages_count,
-                                bool use_browser_overlays);
+                                int expected_pages_count);
 
   // Page Printing / Rendering ------------------------------------------------
 
   // Prints all the pages listed in |print_pages_params_|.
   // It will implicitly revert the document to display CSS media type.
   bool PrintPages(WebKit::WebFrame* frame, const WebKit::WebNode& node);
+  bool PrintPagesNative(WebKit::WebFrame* frame,
+                        const WebKit::WebNode& node,
+                        int page_count,
+                        const gfx::Size& canvas_size);
 
   // Prints the page listed in |params|.
 #if defined(USE_X11)
   void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
                          const gfx::Size& canvas_size,
                          WebKit::WebFrame* frame,
                          Metafile* metafile);
 #else
   void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
                          const gfx::Size& canvas_size,
                          WebKit::WebFrame* frame);
 #endif
 
   // Render the frame for printing.
   bool RenderPagesForPrint(WebKit::WebFrame* frame,
                            const WebKit::WebNode& node);
 
   // Platform specific helper function for rendering page(s) to |metafile|.
 #if defined(OS_WIN)
   void RenderPage(const PrintMsg_Print_Params& params,
                   int page_number,
                   WebKit::WebFrame* frame,
                   bool is_preview,
                   Metafile* metafile,
                   double* scale_factor,
                   gfx::Size* page_size_in_dpi,
                   gfx::Rect* content_area_in_dpi);
 #elif defined(OS_MACOSX)
-  void RenderPage(const PrintMsg_Print_Params& params, int page_number,
-                  WebKit::WebFrame* frame, bool is_preview,
-                  Metafile* metafile, gfx::Size* page_size,
+  void RenderPage(const PrintMsg_Print_Params& params,
+                  int page_number,
+                  WebKit::WebFrame* frame,
+                  bool is_preview,
+                  Metafile* metafile,
+                  gfx::Size* page_size,
                   gfx::Rect* content_rect);
-#elif defined(OS_POSIX)
-  bool RenderPages(const PrintMsg_PrintPages_Params& params,
-                   WebKit::WebFrame* frame, const WebKit::WebNode& node,
-                   std::vector<int>* printed_pages,
-                   Metafile* metafile);
 #endif  // defined(OS_WIN)
 
   // Renders page contents from |frame| to |content_area| of |canvas|.
   // |page_number| is zero-based.
   // When method is called, canvas should be setup to draw to |canvas_area|
   // with |scale_factor|.
   static float RenderPageContent(WebKit::WebFrame* frame,
                                  int page_number,
                                  const gfx::Rect& canvas_area,
                                  const gfx::Rect& content_area,
                                  double scale_factor,
                                  WebKit::WebCanvas* canvas);
 
   // Helper methods -----------------------------------------------------------
 
   bool CopyAndPrint(WebKit::WebFrame* web_frame);
 
   bool CopyMetafileDataToSharedMem(Metafile* metafile,
                                    base::SharedMemoryHandle* shared_mem_handle);
 
   // Helper method to get page layout in points and fit to page if needed.
   static void ComputePageLayoutInPointsForCss(
       WebKit::WebFrame* frame,
       int page_index,
       const PrintMsg_Print_Params& default_params,
       bool ignore_css_margins,
       double* scale_factor,
       PageSizeMargins* page_layout_in_points);
 
-  // Prepare the frame and view for print and then call this function to honor
-  // the CSS page layout information.
-  static void UpdateFrameAndViewFromCssPageLayout(
-      WebKit::WebFrame* frame,
-      const WebKit::WebNode& node,
-      PrepareFrameAndViewForPrint* prepare,
-      const PrintMsg_Print_Params& params,
-      bool ignore_css_margins);
-
   // 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 PageSizeMargins& page_layout_in_points,
       const base::DictionaryValue& header_footer_info,
       const PrintMsg_Print_Params& params);
@@ skipping 159 matching lines @@
   };
 
   bool print_node_in_progress_;
   PrintPreviewContext print_preview_context_;
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
 };
 
 }  // namespace printing
 
 #endif  // CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_