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

webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 0c42e1d8764bc17df40aad4090d64ae2eb2b7a72..30b99ef7220fd91b8852d49f9420b5e82c055f80 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1135,7 +1135,10 @@ bool PluginInstance::IsPrintScalingDisabled() {
   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);
@@ -1150,9 +1153,13 @@ int PluginInstance::PrintBegin(const gfx::Rect& printable_area,
   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);