Check for specific PPB interface versions in C++ wrappers.

ppapi/cpp/instance.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/instance.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/resource.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/cpp/view.h"
 
 namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_InputEvent>() {
-  return PPB_INPUT_EVENT_INTERFACE;
+template <> const char* interface_name<PPB_InputEvent_1_0>() {
+  return PPB_INPUT_EVENT_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_Instance>() {
-  return PPB_INSTANCE_INTERFACE;
+template <> const char* interface_name<PPB_Instance_1_0>() {
+  return PPB_INSTANCE_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_Messaging>() {
-  return PPB_MESSAGING_INTERFACE;
+template <> const char* interface_name<PPB_Messaging_1_0>() {
+  return PPB_MESSAGING_INTERFACE_1_0;
 }
 
 }  // namespace
 
 Instance::Instance(PP_Instance instance) : pp_instance_(instance) {
 }
 
 Instance::~Instance() {
 }
 
@@ skipping 21 matching lines @@
 
 bool Instance::HandleInputEvent(const InputEvent& /*event*/) {
   return false;
 }
 
 void Instance::HandleMessage(const Var& /*message*/) {
   return;
 }
 
 bool Instance::BindGraphics(const Graphics2D& graphics) {
-  if (!has_interface<PPB_Instance>())
+  if (!has_interface<PPB_Instance_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_Instance>()->BindGraphics(
+  return PP_ToBool(get_interface<PPB_Instance_1_0>()->BindGraphics(
       pp_instance(), graphics.pp_resource()));
 }
 
 bool Instance::BindGraphics(const Graphics3D& graphics) {
-  if (!has_interface<PPB_Instance>())
+  if (!has_interface<PPB_Instance_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_Instance>()->BindGraphics(
+  return PP_ToBool(get_interface<PPB_Instance_1_0>()->BindGraphics(
       pp_instance(), graphics.pp_resource()));
 }
 
 bool Instance::IsFullFrame() {
-  if (!has_interface<PPB_Instance>())
+  if (!has_interface<PPB_Instance_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_Instance>()->IsFullFrame(pp_instance()));
+  return PP_ToBool(get_interface<PPB_Instance_1_0>()->IsFullFrame(
+      pp_instance()));
 }
 
 int32_t Instance::RequestInputEvents(uint32_t event_classes) {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return PP_ERROR_NOINTERFACE;
-  return get_interface<PPB_InputEvent>()->RequestInputEvents(pp_instance(),
-                                                             event_classes);
+  return get_interface<PPB_InputEvent_1_0>()->RequestInputEvents(pp_instance(),
+                                                                 event_classes);
 }
 
 int32_t Instance::RequestFilteringInputEvents(uint32_t event_classes) {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return PP_ERROR_NOINTERFACE;
-  return get_interface<PPB_InputEvent>()->RequestFilteringInputEvents(
+  return get_interface<PPB_InputEvent_1_0>()->RequestFilteringInputEvents(
       pp_instance(), event_classes);
 }
 
 void Instance::ClearInputEventRequest(uint32_t event_classes) {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return;
-  get_interface<PPB_InputEvent>()->ClearInputEventRequest(pp_instance(),
+  get_interface<PPB_InputEvent_1_0>()->ClearInputEventRequest(pp_instance(),
                                                           event_classes);
 }
 
 void Instance::PostMessage(const Var& message) {
-  if (!has_interface<PPB_Messaging>())
+  if (!has_interface<PPB_Messaging_1_0>())
     return;
-  get_interface<PPB_Messaging>()->PostMessage(pp_instance(),
+  get_interface<PPB_Messaging_1_0>()->PostMessage(pp_instance(),
                                               message.pp_var());
 }
 
 void Instance::AddPerInstanceObject(const std::string& interface_name,
                                     void* object) {
   // Ensure we're not trying to register more than one object per interface
   // type. Otherwise, we'll get confused in GetPerInstanceObject.
   PP_DCHECK(interface_name_to_objects_.find(interface_name) ==
             interface_name_to_objects_.end());
   interface_name_to_objects_[interface_name] = object;
@@ skipping 35 matching lines @@
   if (!that)
     return NULL;
   InterfaceNameToObjectMap::iterator found =
       that->interface_name_to_objects_.find(interface_name);
   if (found == that->interface_name_to_objects_.end())
     return NULL;
   return found->second;
 }
 
 }  // namespace pp