[Print Preview] Modified PrepareFrameAndViewPrint class to call the new printBegin function to supp…

chrome/renderer/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_PRINT_WEB_VIEW_HELPER_H_
 #define CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/time.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 #include "ui/gfx/size.h"
 
 struct PrintMsg_Print_Params;
 struct PrintMsg_PrintPage_Params;
 struct PrintMsg_PrintPages_Params;
 
 namespace base {
 class DictionaryValue;
 }
@@ skipping 17 matching lines @@
   void UpdatePrintParams(const PrintMsg_Print_Params& print_params);
 
   int GetExpectedPageCount() const {
     return expected_pages_count_;
   }
 
   bool ShouldUseBrowserOverlays() const {
     return use_browser_overlays_;
   }
 
-  const gfx::Size& GetPrintCanvasSize() const {
-    return print_canvas_size_;
+  gfx::Size GetPrintCanvasSize() const {
+    return gfx::Size(web_print_params_.printContentArea.width,

[darin (slow to review), 2012/05/17 19:13:03]

WebSize can automagically be converted to gfx::Size.

[kmadhusu, 2012/05/17 20:16:29]

PrintContentArea is a WebRect. I didn't find an easy way to create/get gfx::Size
from WebRect. Is there any simple way to do that?

[kmadhusu, 2012/05/17 21:24:44]

Darin: In order to commit the webkit CL asap, I am going to check the CQ
checkbox now. If there is any better way to return gfx::Size, I will make those
changes in a separate CL.  

+                     web_print_params_.printContentArea.height);
   }
 
   void FinishPrinting();
 
  private:
-  void StartPrinting(const gfx::Size& print_params);
+  void StartPrinting(const WebKit::WebPrintParams& webkit_print_params);
 
   WebKit::WebFrame* frame_;
   WebKit::WebNode node_to_print_;
   WebKit::WebView* web_view_;
-  gfx::Size print_canvas_size_;
+  WebKit::WebPrintParams web_print_params_;
   gfx::Size prev_view_size_;
   gfx::Size prev_scroll_offset_;
-  int dpi_;
   int expected_pages_count_;
   bool use_browser_overlays_;
   bool finished_;
 
   DISALLOW_COPY_AND_ASSIGN(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.
@@ skipping 69 matching lines @@
       const printing::PageSizeMargins& page_layout_in_points,
       gfx::Size* page_size,
       gfx::Rect* content_area);
 
   // Update |ignore_css_margins_| 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);
 
-  // Returns false if
-  // (1) The current destination printer is SAVE_AS_PDF or
+  // Returns the print scaling option to retain/scale/crop the source page size
+  // to fit the printable area of the paper.
+  //
+  // We retain the source page size when the current destination printer is
+  // SAVE_AS_PDF.
+  //
+  // We crop the source page size to fit the printable area or we print only the
+  // left top page contents when
+  // (1) Source is PDF and the user has requested not to fit to printable area
+  // via |job_settings|.
   // (2) Source is PDF. This is the first preview request and print scaling
   // option is disabled for initiator renderer plugin.
-  // (3) Source is PDF and the user has requested not to fit to printable area
-  // via |job_settings|.
-  // In all other cases returns true to fit the print contents in paper size.
-  bool IsFitToPaperSizeRequested(bool source_is_html,
-                                 const base::DictionaryValue& job_settings,
-                                 const PrintMsg_Print_Params& params);
+  //
+  // In all other cases, we scale the source page to fit the printable area.
+  WebKit::WebPrintScalingOption GetPrintScalingOption(
+      bool source_is_html,
+      const base::DictionaryValue& job_settings,
+      const PrintMsg_Print_Params& params);
 
   // 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();
 
@@ skipping 21 matching lines @@
 
   void Print(WebKit::WebFrame* frame, const WebKit::WebNode& node);
 
   // 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 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);
 
@@ skipping 203 matching lines @@
     void set_generate_draft_pages(bool generate_draft_pages);
     void set_error(enum PrintPreviewErrorBuckets error);
 
     // Getters
     WebKit::WebFrame* frame();
     const WebKit::WebNode& node() const;
     int total_page_count() const;
     bool generate_draft_pages() const;
     printing::PreviewMetafile* metafile();
     const PrintMsg_Print_Params& print_params() const;
-    const gfx::Size& GetPrintCanvasSize() const;
+    gfx::Size GetPrintCanvasSize() const;
     int last_error() const;
 
    private:
     enum State {
       UNINITIALIZED,  // Not ready to render.
       INITIALIZED,    // Ready to render.
       RENDERING,      // Rendering.
       DONE            // Finished rendering.
     };
 
@@ skipping 29 matching lines @@
     enum PrintPreviewErrorBuckets error_;
 
     State state_;
   };
 
   PrintPreviewContext print_preview_context_;
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
 };
 
 #endif  // CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_