Make o.o.p. proxy handle PPP_Instance versions 0.4 and 0.5.

webkit/plugins/ppapi/plugin_module.cc

 // Copyright (c) 2011 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/plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 195 matching lines @@
   return ResourceTracker::Get()->GetLiveObjectsForInstance(instance_id);
 }
 
 const PPB_Testing_Dev testing_interface = {
   &ReadImageData,
   &RunMessageLoop,
   &QuitMessageLoop,
   &GetLiveObjectsForInstance
 };
 
-// Return the part of the interface name before the ';' separator.
-// If there is no ';', just returns the whole string.
-std::string GetInterfacePrefix(const std::string& interface_string) {
-  size_t separator_pos = interface_string.find_first_of(';');
-  return interface_string.substr(0, separator_pos);
-}
-
 // GetInterface ----------------------------------------------------------------
 
 const void* GetInterface(const char* name) {
   // All interfaces should be used on the main thread.
   DCHECK(IsMainThread());
 
-  std::string name_prefix(GetInterfacePrefix(name));
-
   // Allow custom interface factories first stab at the GetInterface call.
   const void* custom_interface =
       PpapiInterfaceFactoryManager::GetInstance()->GetInterface(name);
   if (custom_interface)
     return custom_interface;
 
   // Please keep alphabetized by interface macro name with "special" stuff at
   // the bottom.
   if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_AudioConfig_Thunk();
@@ skipping 242 matching lines @@
   return &core_interface;
 }
 
 // static
 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
   return &GetInterface;
 }
 
 PluginInstance* PluginModule::CreateInstance(PluginDelegate* delegate) {
   PluginInstance* instance(NULL);
-  const void* plugin_instance_if =
-      GetPluginInterface(PPP_INSTANCE_INTERFACE_0_5);
-  if (plugin_instance_if) {
-    instance = new PluginInstance(delegate, this,
-        PluginInstance::new_instance_interface<PPP_Instance_0_5>(
-            plugin_instance_if));
+  const void* ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_0_5);
+  if (ppp_instance) {
+    instance = PluginInstance::Create0_5(delegate, this, ppp_instance);
   } else {
-    // If the current interface is not supported, try retrieving older versions.
-    const void* instance_if_0_4 =
-        GetPluginInterface(PPP_INSTANCE_INTERFACE_0_4);
-    if (instance_if_0_4) {
-      instance = new PluginInstance(delegate, this,
-          PluginInstance::new_instance_interface<PPP_Instance_0_4>(
-              instance_if_0_4));
-    }
+    // If the 0.5 interface is not supported, try retrieving 0.4.
+    ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_0_4);
+    if (ppp_instance)
+      instance = PluginInstance::Create0_4(delegate, this, ppp_instance);
   }
   if (!instance) {
     LOG(WARNING) << "Plugin doesn't support instance interface, failing.";
     return NULL;
   }
   if (out_of_process_proxy_.get())
     out_of_process_proxy_->AddInstance(instance->pp_instance());
   return instance;
 }
 
@@ skipping 72 matching lines @@
   int retval = entry_points_.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit