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

ppapi/proxy/dispatcher.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 "ppapi/proxy/dispatcher.h"
 
 #include <string.h>  // For memset.
 
 #include <map>
 
@@ skipping 85 matching lines @@
 
   typedef std::map<std::string, const InterfaceProxy::Info*> NameToInfo;
   NameToInfo name_to_plugin_info_;
   NameToInfo name_to_browser_info_;
 
   // Note that there can be multiple interface names mapping to the same ID.
   // In this case, the ID will map to one of them. This is temporary while
   // we're converting to the thunk system, when that is complete, we need to
   // have a better way of handling multiple interface implemented by one
   // proxy object.
-  const InterfaceProxy::Info* id_to_plugin_info_[INTERFACE_ID_COUNT];
   const InterfaceProxy::Info* id_to_browser_info_[INTERFACE_ID_COUNT];
 };
 
 InterfaceList::InterfaceList() {
-  memset(id_to_plugin_info_, 0, sizeof(id_to_plugin_info_));
   memset(id_to_browser_info_, 0, sizeof(id_to_browser_info_));
 
   // PPB (browser) interfaces.
   AddPPB(PPB_AudioConfig_Proxy::GetInfo());
   AddPPB(PPB_Audio_Proxy::GetInfo());
   AddPPB(PPB_Broker_Proxy::GetInfo());
   AddPPB(PPB_Buffer_Proxy::GetInfo());
   AddPPB(PPB_CharSet_Proxy::GetInfo());
   AddPPB(PPB_Console_Proxy::GetInfo());
   AddPPB(PPB_Context3D_Proxy::GetInfo());
@@ skipping 28 matching lines @@
   AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
   AddPPB(PPB_Var_Proxy::GetInfo());
 
 #ifdef ENABLE_FLAPPER_HACKS
   AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo());
 #endif
 
   // PPP (plugin) interfaces.
   AddPPP(PPP_Graphics3D_Proxy::GetInfo());
   AddPPP(PPP_Instance_Private_Proxy::GetInfo());
-  AddPPP(PPP_Instance_Proxy::GetInfo());
+  AddPPP(PPP_Instance_Proxy::GetInfo0_4());
+  AddPPP(PPP_Instance_Proxy::GetInfo0_5());
 }
 
 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
   DCHECK(name_to_plugin_info_.find(info->name) ==
          name_to_plugin_info_.end());
   DCHECK(info->id >= INTERFACE_ID_NONE && info->id < INTERFACE_ID_COUNT);
-  DCHECK(info->id == INTERFACE_ID_NONE || id_to_plugin_info_[info->id] == NULL);
 
   name_to_plugin_info_[info->name] = info;
-  if (info->id != INTERFACE_ID_NONE)
-    id_to_plugin_info_[info->id] = info;
 }
 
 void InterfaceList::AddPPB(const InterfaceProxy::Info* info) {
   DCHECK(name_to_browser_info_.find(info->name) ==
          name_to_browser_info_.end());
   DCHECK(info->id >= INTERFACE_ID_NONE && info->id < INTERFACE_ID_COUNT);
   DCHECK(info->id == INTERFACE_ID_NONE ||
          id_to_browser_info_[info->id] == NULL);
 
   name_to_browser_info_[std::string(info->name)] = info;
@@ skipping 56 matching lines @@
 const InterfaceProxy::Info* Dispatcher::GetPPPInterfaceInfo(
     const std::string& name) {
   const InterfaceList* list = InterfaceList::GetInstance();
   InterfaceList::NameToInfo::const_iterator found =
       list->name_to_plugin_info_.find(name);
   if (found == list->name_to_plugin_info_.end())
     return NULL;
   return found->second;
 }
 
-// static
-const InterfaceProxy::Info* Dispatcher::GetPPPInterfaceInfo(InterfaceID id) {
-  if (id <= 0 || id >= INTERFACE_ID_COUNT)
-    return NULL;
-  const InterfaceList* list = InterfaceList::GetInstance();
-  return list->id_to_plugin_info_[id];
-}
-
 void Dispatcher::SetSerializationRules(
     VarSerializationRules* var_serialization_rules) {
   serialization_rules_.reset(var_serialization_rules);
 }
 
 const void* Dispatcher::GetLocalInterface(const char* interface_name) {
   return local_get_interface_(interface_name);
 }
 
 base::MessageLoopProxy* Dispatcher::GetIPCMessageLoop() {
   return delegate()->GetIPCMessageLoop();
 }
 
 void Dispatcher::AddIOThreadMessageFilter(
     IPC::ChannelProxy::MessageFilter* filter) {
   channel()->AddFilter(filter);
 }
 
 }  // namespace proxy
 }  // namespace pp