Implement browser side of PPB_Printing resource.

ppapi/cpp/dev/printing_dev.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 "ppapi/cpp/dev/printing_dev.h"
 
 #include "ppapi/c/dev/ppb_printing_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
 namespace pp {
 
 namespace {
 
 static const char kPPPPrintingInterface[] = PPP_PRINTING_DEV_INTERFACE;
 
+template <> const char* interface_name<PPB_Printing_Dev_0_7>() {
+  return PPB_PRINTING_DEV_INTERFACE_0_7;
+}
+
 template <> const char* interface_name<PPB_Printing_Dev_0_6>() {
   return PPB_PRINTING_DEV_INTERFACE_0_6;
 }
 
 uint32_t QuerySupportedFormats(PP_Instance instance) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPPrintingInterface);
   if (!object)
     return 0;
   return static_cast<Printing_Dev*>(object)->QuerySupportedPrintOutputFormats();
@@ skipping 40 matching lines @@
   &QuerySupportedFormats,
   &Begin,
   &PrintPages,
   &End,
   &IsScalingDisabled
 };
 
 }  // namespace
 
 Printing_Dev::Printing_Dev(Instance* instance)
-      : associated_instance_(instance) {
+    : associated_instance_(instance) {
   Module::Get()->AddPluginInterface(kPPPPrintingInterface, &ppp_printing);
-  instance->AddPerInstanceObject(kPPPPrintingInterface, this);
+  instance->AddPerInstanceObject(
+      kPPPPrintingInterface, this);
+  if (has_interface<PPB_Printing_Dev_0_7>()) {
+    PassRefFromConstructor(get_interface<PPB_Printing_Dev_0_7>()->Create(
+        associated_instance_.pp_instance()));
+  }
 }
 
 Printing_Dev::~Printing_Dev() {
   Instance::RemovePerInstanceObject(associated_instance_,
                                     kPPPPrintingInterface, this);
 }
 
 // static
 bool Printing_Dev::IsAvailable() {
-  return has_interface<PPB_Printing_Dev_0_6>();
+  return has_interface<PPB_Printing_Dev_0_7>() ||
+      has_interface<PPB_Printing_Dev_0_6>();
+
 }
 
-bool Printing_Dev::GetDefaultPrintSettings(
-    PP_PrintSettings_Dev* print_settings) const {
-  if (!has_interface<PPB_Printing_Dev_0_6>())
-    return false;
-  return PP_ToBool(
-      get_interface<PPB_Printing_Dev_0_6>()->GetDefaultPrintSettings(
-          associated_instance_.pp_instance(), print_settings));
+void Printing_Dev::GetDefaultPrintSettings(
+    const CompletionCallbackWithOutput<PP_PrintSettings_Dev>& callback) const {
+  if (has_interface<PPB_Printing_Dev_0_7>()) {
+    int32_t result =
+        get_interface<PPB_Printing_Dev_0_7>()->GetDefaultPrintSettings(
+            pp_resource(), callback.output(),
+            callback.pp_completion_callback());
+    if (result != PP_OK_COMPLETIONPENDING)

[brettw, 2012/09/18 21:41:38]

You shouldn't need to do this check in the C++ wrappers. It should be handled by
the thunk layer by the enter functions for you.

[raymes, 2012/09/18 23:43:57]

Done.

+      Module::Get()->core()->CallOnMainThread(0, callback, result);
+  }
+  else if (has_interface<PPB_Printing_Dev_0_6>()) {

[brettw, 2012/09/18 21:41:38]

Goes on previous line.

[raymes, 2012/09/18 23:43:57]

Done.

+    bool success = PP_ToBool(get_interface<PPB_Printing_Dev_0_6>()->
+        GetDefaultPrintSettings(associated_instance_.pp_instance(),
+                                callback.output()));
+    Module::Get()->core()->CallOnMainThread(0, callback,
+                                            success ? PP_OK : PP_ERROR_FAILED);
+  }
 }
 
 }  // namespace pp