New thunk system for Pepper proxy and implementation

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/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/dispatcher.h"
+#include "ppapi/shared_impl/function_group_base.h"
 
 class MessageLoop;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace pp {
 namespace proxy {
 
@@ skipping 37 matching lines @@
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelError();
 
   // Keeps track of which dispatcher to use for each instance, active instances
   // and tracks associated data like the current size.
   void DidCreateInstance(PP_Instance instance);
   void DidDestroyInstance(PP_Instance instance);
 
   // Gets the data for an existing instance, or NULL if the instance id doesn't
-  // correspond to  a known instance.
+  // correspond to a known instance.
   InstanceData* GetInstanceData(PP_Instance instance);
 
+  // Returns the "new-style" function API for the given interface ID, creating
+  // it if necessary.
+  // TODO(brettw) this is in progress. It should be merged with the target
+  // proxies so there is one list to consult.
+  ::ppapi::shared_impl::FunctionGroupBase* GetFunctionAPI(
+      pp::proxy::InterfaceID id);
+
  private:
   friend class PluginDispatcherTest;
 
   // 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);
 
   // 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< ::ppapi::shared_impl::FunctionGroupBase >
+      function_proxies_[INTERFACE_ID_COUNT];
+
   typedef base::hash_map<PP_Instance, InstanceData> InstanceDataMap;
   InstanceDataMap instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_PLUGIN_DISPATCHER_H_