[Print Preview] Modified PP_PrintSettings_Dev interface to support auto fit to page functionality.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 1117 matching lines @@
   return GetPreferredPrintOutputFormat(&format);
 }
 
 bool PluginInstance::IsPrintScalingDisabled() {
   DCHECK(plugin_print_interface_);
   if (!plugin_print_interface_)
     return false;
   return plugin_print_interface_->IsScalingDisabled(pp_instance()) == PP_TRUE;
 }
 
-int PluginInstance::PrintBegin(const gfx::Rect& printable_area,
+int PluginInstance::PrintBegin(const gfx::Rect& content_area,
+                               const gfx::Rect& printable_area,
+                               const gfx::Size& paper_size,
+                               int print_scaling_option,
                                int printer_dpi) {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
   PP_PrintOutputFormat_Dev format;
   if (!GetPreferredPrintOutputFormat(&format)) {
     // PrintBegin should not have been called since SupportsPrintInterface
     // would have returned false;
     NOTREACHED();
     return 0;
   }
 
   int num_pages = 0;
   PP_PrintSettings_Dev print_settings;
   print_settings.printable_area = PP_FromGfxRect(printable_area);
+  print_settings.content_area = PP_FromGfxRect(content_area);
+  print_settings.paper_size = PP_FromGfxSize(paper_size);
   print_settings.dpi = printer_dpi;
   print_settings.orientation = PP_PRINTORIENTATION_NORMAL;
   print_settings.grayscale = PP_FALSE;
+  print_settings.print_scaling_option = static_cast<PP_PrintScalingOption_Dev>(
+      print_scaling_option);

[dmichael (off chromium), 2012/04/20 23:01:45]

Please explicitly convert the enum values or add static checks to make sure they
match up from WebKit to pepper. (see, e.g., the COMPILE_ASSERT_MATCHING_ENUM
stuff earlier in this file).

This will require the WebKit change to land, so if it turns out to not be
possible in this CL, that's OK.

[kmadhusu, 2012/04/23 16:39:30]

Assuming, I will land this patch after committing the webkit header file, I have
 added these compile assert checks.

   print_settings.format = format;
   num_pages = plugin_print_interface_->Begin(pp_instance(),
                                              &print_settings);
   if (!num_pages)
     return 0;
   current_print_settings_ = print_settings;
 #if defined(USE_SKIA)
   canvas_ = NULL;
   ranges_.clear();
 #endif  // USE_SKIA
@@ skipping 877 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit