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

ppapi/proxy/host_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_HOST_DISPATCHER_H_
 #define PPAPI_PROXY_HOST_DISPATCHER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 14 matching lines @@
 namespace IPC {
 class SyncChannel;
 }
 
 namespace ppapi {
 
 struct Preferences;
 
 namespace proxy {
 
+class InterfaceProxy;
 class VarSerialization;
 
 class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
  public:
   // Constructor for the renderer side.
   //
   // You must call InitHostWithChannel after the constructor.
   HostDispatcher(base::ProcessHandle host_process_handle,
                  PP_Module module,
                  GetInterfaceFunc local_get_interface);
@@ skipping 27 matching lines @@
   virtual bool Send(IPC::Message* msg);
 
   // IPC::Channel::Listener.
   virtual bool OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelError();
 
   // Proxied version of calling GetInterface on the plugin. This will check
   // if the plugin supports the given interface (with caching) and returns the
   // pointer to the proxied interface if it is supported. Returns NULL if the
   // given interface isn't supported by the plugin or the proxy.
-  const void* GetProxiedInterface(const std::string& iface_name);
+  const void* GetProxiedInterface(const std::string& proxied_interface);
+
+  // Returns the proxy object associated with the given interface ID, creating
+  // it if necessary. This is used in cases where a proxy needs to access code
+  // in the proxy for another interface. It's assumed that the interface always
+  // exists, so this is only used for browser proxies.
+  //
+  // Will return NULL if an interface isn't supported.
+  InterfaceProxy* GetOrCreatePPBInterfaceProxy(InterfaceID id);
 
   // See the value below. Call this when processing a scripting message from
-  // the plugin that can be reentered. This is set to false at the beginning
-  // of processing of each message from the plugin.
+  // the plugin that can be reentered.
   void set_allow_plugin_reentrancy() {
     allow_plugin_reentrancy_ = true;
   }
 
   // Returns the proxy interface for talking to the implementation.
   const PPB_Proxy_Private* ppb_proxy() const { return ppb_proxy_; }
 
- protected:
-  // Overridden from Dispatcher.
-  virtual void OnInvalidMessageReceived();
+ private:
+  friend class HostDispatcherTest;
 
- private:
+  // Makes an instance of the given PPB interface proxy, storing it in the
+  // target_proxies_ array. An proxy for this interface must not exist yet.
+  InterfaceProxy* CreatePPBInterfaceProxy(const InterfaceProxy::Info* info);
+
   PP_Module pp_module_;
 
+  typedef std::map<std::string, bool> PluginIFSupportedMap;
   // Maps interface name to whether that interface is supported. If an interface
   // name is not in the map, that implies that we haven't queried for it yet.
-  typedef base::hash_map<std::string, bool> PluginSupportedMap;
-  PluginSupportedMap plugin_supported_;
+  std::map<std::string, bool> plugin_if_supported_;
+
+  // All target proxies currently created. These are ones that receive
+  // messages. They are created on demand when we 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];
 
   // Guaranteed non-NULL.
   const PPB_Proxy_Private* ppb_proxy_;
 
   // Set to true when the plugin is in a state that it can be reentered by a
   // sync message from the host. We allow reentrancy only when we're processing
   // a sync message from the renderer that is a scripting command. When the
   // plugin is in this state, it needs to accept reentrancy since scripting may
   // ultimately call back into the plugin.
   bool allow_plugin_reentrancy_;
@@ skipping 15 matching lines @@
  private:
   HostDispatcher* dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedModuleReference);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_HOST_DISPATCHER_H_