First pass at making the proxy handle multiple renderers. This associates the...

ppapi/proxy/plugin_dispatcher.cc

 // Copyright (c) 2010 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/plugin_dispatcher.h"
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 }
 
 }  // namespace
 
 PluginDispatcher::PluginDispatcher(base::ProcessHandle remote_process_handle,
                                    GetInterfaceFunc get_interface,
                                    InitModuleFunc init_module,
                                    ShutdownModuleFunc shutdown_module)
     : Dispatcher(remote_process_handle, get_interface),
       init_module_(init_module),
-      shutdown_module_(shutdown_module),
-      plugin_resource_tracker_(new PluginResourceTracker(
-          ALLOW_THIS_IN_INITIALIZER_LIST(this))),
-      plugin_var_tracker_(new PluginVarTracker(
-          ALLOW_THIS_IN_INITIALIZER_LIST(this))) {
-  SetSerializationRules(
-      new PluginVarSerializationRules(plugin_var_tracker_.get()));
+      shutdown_module_(shutdown_module) {
+  SetSerializationRules(new PluginVarSerializationRules);
 
   // As a plugin, we always support the PPP_Class interface. There's no
   // GetInterface call or name for it, so we insert it into our table now.
   InjectProxy(INTERFACE_ID_PPP_CLASS, "$Internal_PPP_Class",
               new PPP_Class_Proxy(this));
 }
 
 PluginDispatcher::~PluginDispatcher() {
   if (shutdown_module_)
     shutdown_module_();
 }
 
 // static
 PluginDispatcher* PluginDispatcher::Get() {
   return g_dispatcher;
 }
 
 // static
 void PluginDispatcher::SetGlobal(PluginDispatcher* dispatcher) {
   DCHECK(!dispatcher || !g_dispatcher);
   g_dispatcher = dispatcher;
 }
 
+// static
+PluginDispatcher* PluginDispatcher::GetForInstance(PP_Instance instance) {
+  // TODO(brettw) implement "real" per-instance dispatcher map.
+  DCHECK(instance != 0);
+  return Get();
+}
+
 bool PluginDispatcher::IsPlugin() const {
   return true;
 }
 
 bool PluginDispatcher::OnMessageReceived(const IPC::Message& msg) {
   if (msg.routing_id() == MSG_ROUTING_CONTROL) {
     // Handle some plugin-specific control messages.
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(PluginDispatcher, msg)
       IPC_MESSAGE_HANDLER(PpapiMsg_InitializeModule, OnMsgInitializeModule)
@@ skipping 17 matching lines @@
 
 void PluginDispatcher::OnMsgShutdown() {
   if (shutdown_module_)
     shutdown_module_();
   MessageLoop::current()->Quit();
 }
 
 }  // namespace proxy
 }  // namespace pp