Remove all uses of the global Dispatcher Get function.

ppapi/proxy/ppp_instance_proxy.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/ppp_instance_proxy.h"
 
 #include <algorithm>
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/proxy/host_dispatcher.h"
@@ skipping 81 matching lines @@
 static const PPP_Instance instance_interface = {
   &DidCreate,
   &DidDestroy,
   &DidChangeView,
   &DidChangeFocus,
   &HandleInputEvent,
   &HandleDocumentLoad,
   &GetInstanceObject
 };
 
+InterfaceProxy* CreateInstanceProxy(Dispatcher* dispatcher,
+                                    const void* target_interface) {
+  return new PPP_Instance_Proxy(dispatcher, target_interface);
+}
+
 }  // namespace
 
 PPP_Instance_Proxy::PPP_Instance_Proxy(Dispatcher* dispatcher,
                                        const void* target_interface)
     : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPP_Instance_Proxy::~PPP_Instance_Proxy() {
 }
 
-const void* PPP_Instance_Proxy::GetSourceInterface() const {
-  return &instance_interface;
-}
-
-InterfaceID PPP_Instance_Proxy::GetInterfaceId() const {
-  return INTERFACE_ID_PPP_INSTANCE;
+// static
+const InterfaceProxy::Info* PPP_Instance_Proxy::GetInfo() {
+  static const Info info = {
+    &instance_interface,
+    PPP_INSTANCE_INTERFACE,
+    INTERFACE_ID_PPP_INSTANCE,
+    false,
+    &CreateInstanceProxy,
+  };
+  return &info;
 }
 
 bool PPP_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPP_Instance_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_DidCreate,
                         OnMsgDidCreate)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_DidDestroy,
                         OnMsgDidDestroy)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_DidChangeView,
@@ skipping 13 matching lines @@
 
 void PPP_Instance_Proxy::OnMsgDidCreate(
     PP_Instance instance,
     const std::vector<std::string>& argn,
     const std::vector<std::string>& argv,
     PP_Bool* result) {
   *result = PP_FALSE;
   if (argn.size() != argv.size())
     return;
 
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
-  if (!dispatcher)
-    return;
-  dispatcher->DidCreateInstance(instance);
+  // Set up the routing associating this new instance with the dispatcher we
+  // just got the message from. This must be done before calling into the
+  // plugin so it can in turn call PPAPI functions.
+  PluginDispatcher* plugin_dispatcher =
+      static_cast<PluginDispatcher*>(dispatcher());
+  PluginDispatcher::SetForInstance(instance, plugin_dispatcher);
+  plugin_dispatcher->DidCreateInstance(instance);

[piman, 2011/02/07 21:29:22]

Maybe we can combine SetForInstance and DidCreateInstance ?
Similarly below, RemoveForInstance/DidDestroyInstance.

[brettw, 2011/02/08 00:28:04]

Good idea.

 
   // Make sure the arrays always have at least one element so we can take the
   // address below.
   std::vector<const char*> argn_array(
       std::max(static_cast<size_t>(1), argn.size()));
   std::vector<const char*> argv_array(
       std::max(static_cast<size_t>(1), argn.size()));
   for (size_t i = 0; i < argn.size(); i++) {
     argn_array[i] = argn[i].c_str();
     argv_array[i] = argv[i].c_str();
   }
 
   DCHECK(ppp_instance_target());
   *result = ppp_instance_target()->DidCreate(instance,
                                              static_cast<uint32_t>(argn.size()),
                                              &argn_array[0], &argv_array[0]);
-  DCHECK(*result);
+  if (!*result) {
+    // In the failure to create case, this plugin instance will be torn down
+    // without further notification, so we also need to undo the routing.
+    PluginDispatcher::RemoveForInstance(instance);
+  }
 }
 
 void PPP_Instance_Proxy::OnMsgDidDestroy(PP_Instance instance) {
   ppp_instance_target()->DidDestroy(instance);
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
-  if (!dispatcher)
-    return;
-
-  dispatcher->DidDestroyInstance(instance);
+  PluginDispatcher::RemoveForInstance(instance);
+  static_cast<PluginDispatcher*>(dispatcher())->DidDestroyInstance(instance);
 }
 
 void PPP_Instance_Proxy::OnMsgDidChangeView(PP_Instance instance,
                                             const PP_Rect& position,
                                             const PP_Rect& clip) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return;
   InstanceData* data = dispatcher->GetInstanceData(instance);
   if (!data)
@@ skipping 24 matching lines @@
 
 void PPP_Instance_Proxy::OnMsgGetInstanceObject(
     PP_Instance instance,
     SerializedVarReturnValue result) {
   result.Return(dispatcher(),
                 ppp_instance_target()->GetInstanceObject(instance));
 }
 
 }  // namespace proxy
 }  // namespace pp