Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/plugin_dispatcher.h

 // 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.
 
 #ifndef PPAPI_PROXY_PLUGIN_DISPATCHER_H_
 #define PPAPI_PROXY_PLUGIN_DISPATCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 70 matching lines @@
   // The plugin side maintains a mapping from PP_Instance to Dispatcher so
   // that we can send the messages to the right channel if there are multiple
   // renderers sharing the same plugin. This mapping is maintained by
   // DidCreateInstance/DidDestroyInstance.
   static PluginDispatcher* GetForInstance(PP_Instance instance);
 
   // Same as GetForInstance but retrieves the instance from the given resource
   // object as a convenience. Returns NULL on failure.
   static PluginDispatcher* GetForResource(const Resource* resource);
 
-  // Implements the GetInterface function for the plugin to call to retrieve
-  // a browser interface.
-  static const void* GetBrowserInterface(const char* interface);
-
-  const void* GetPluginInterface(const std::string& interface_name);
+  static const void* GetInterfaceFromDispatcher(
+      const char* dispatcher_interface);
 
   // You must call this function before anything else. Returns true on success.
   // The delegate pointer must outlive this class, ownership is not
   // transferred.
   bool InitPluginWithChannel(PluginDelegate* delegate,
                              const IPC::ChannelHandle& channel_handle,
                              bool is_client);
 
   // Dispatcher overrides.
   virtual bool IsPlugin() const;
@@ skipping 39 matching lines @@
   // Notifies all live instances that they're now closed. This is used when
   // a renderer crashes or some other error is received.
   void ForceFreeAllInstances();
 
   // IPC message handlers.
   void OnMsgSupportsInterface(const std::string& interface_name, bool* result);
   void OnMsgSetPreferences(const Preferences& prefs);
 
   PluginDelegate* plugin_delegate_;
 
-  // Contains all the plugin interfaces we've queried. The mapped value will
-  // be the pointer to the interface pointer supplied by the plugin if it's
-  // supported, or NULL if it's not supported. This allows us to cache failures
-  // and not req-query if a plugin doesn't support the interface.
-  typedef base::hash_map<std::string, const void*> InterfaceMap;
-  InterfaceMap plugin_interfaces_;
+  // All target proxies currently created. These are ones that receive
+  // messages.
+  scoped_ptr<InterfaceProxy> target_proxies_[INTERFACE_ID_COUNT];
+
+  // Function proxies created for "new-style" FunctionGroups.
+  // TODO(brettw) this is in progress. It should be merged with the target
+  // proxies so there is one list to consult.
+  scoped_ptr<FunctionGroupBase> function_proxies_[INTERFACE_ID_COUNT];
 
   typedef base::hash_map<PP_Instance, InstanceData> InstanceDataMap;
   InstanceDataMap instance_map_;
 
   // The preferences sent from the host. We only want to set this once, which
   // is what the received_preferences_ indicates. See OnMsgSetPreferences.
   bool received_preferences_;
   Preferences preferences_;
 
   uint32 plugin_dispatcher_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PLUGIN_DISPATCHER_H_