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

webkit/plugins/ppapi/ppapi_webplugin_impl.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_webplugin_impl.h"
 
 #include <cmath>
 
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/plugins/ppapi/message_channel.h"
 #include "webkit/plugins/ppapi/npobject_var.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 
 using ppapi::NPObjectVar;
 using WebKit::WebCanvas;
 using WebKit::WebPluginContainer;
 using WebKit::WebPluginParams;
 using WebKit::WebPoint;
 using WebKit::WebRect;
+using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 using WebKit::WebView;
 
 namespace webkit {
 namespace ppapi {
 
 struct WebPluginImpl::InitData {
   scoped_refptr<PluginModule> module;
@@ skipping 198 matching lines @@
 }
 
 bool WebPluginImpl::supportsPaginatedPrint() {
   return instance_->SupportsPrintInterface();
 }
 
 bool WebPluginImpl::isPrintScalingDisabled() {
   return instance_->IsPrintScalingDisabled();
 }
 
-int WebPluginImpl::printBegin(const WebKit::WebRect& printable_area,
+// TODO(kmadhusu): This is a temporary interface to avoid the compile errors.
+// Remove this function after fixing crbug.com/85132.
+int WebPluginImpl::printBegin(const WebKit::WebRect& content_area,
                               int printer_dpi) {
-  return instance_->PrintBegin(printable_area, printer_dpi);
+  WebKit::WebRect printable_area(content_area);
+  WebKit::WebSize paper_size(content_area.width, content_area.height);
+  return instance_->PrintBegin(content_area, printable_area, paper_size,
+                               2, printer_dpi);

[kmadhusu, 2012/04/20 22:29:57]

dmichael: Can I include ppapi/c/dev/ppp_printing_dev.h in this file and use
PP_PRINTSCALEOPTION_ACTUAL_SIZE here?

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

You could, but shouldn't it be the WebKit value at this level?

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

Yeah it is a WebKit value. Since I had 'int' data type in my previous version of
printBegin() function, I thought I will pass the PP_PrintScaleOption_Dev  value
directly. Now that, we are planning to commit the webkit header file first, I 
will pass the webkit enum value directly. 

+}
+
+int WebPluginImpl::printBegin(const WebKit::WebRect& content_area,
+                              const WebKit::WebRect& printable_area,
+                              const WebKit::WebSize& paper_size,
+                              int print_scaling_option,

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

Is this the typical way of making these 2-sided changes? I might have expected
you to land the WebKit side first with a default implementation initially.

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

If we are going to create a new function and the  call site is in Chromium code,
then we will land the Webkit patch first. Once the webkit changes are rolled
into Chromium, we will update the Chromium to use the new webkit function. 

In our case, we have code calling (both ways) from Chromium --> Webkit  -->
Chromium plugin.  We are just trying to support printing and to avoid compile
errors while committing these individual patches. 

[dmichael (off chromium), 2012/04/23 17:02:40]

Right...  I think you could land the WebKit side first but not use new function
yet there (so long as it wasn't a pure virtual function). But now I see that
doesn't really make sense; I was stuck on the problem of the enum. I like the
approach of putting in the enum first, then landing this change (as in patch set
11), then landing the WebKit side with the updated printBegin function.

+                              int printer_dpi) {
+  return instance_->PrintBegin(content_area, printable_area, paper_size,
+                               print_scaling_option, printer_dpi);
 }
 
 bool WebPluginImpl::printPage(int page_number,
                               WebKit::WebCanvas* canvas) {
   return instance_->PrintPage(page_number, canvas);
 }
 
 void WebPluginImpl::printEnd() {
   return instance_->PrintEnd();
 }
 
 bool WebPluginImpl::canRotateView() {
   return instance_->CanRotateView();
 }
 
 void WebPluginImpl::rotateView(RotationType type) {
   instance_->RotateView(type);
 }
 
 }  // namespace ppapi
 }  // namespace webkit