Pepper: Add routing ID information to Connection.

content/renderer/pepper/pepper_in_process_router.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_in_process_router.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "content/public/renderer/render_view.h"
 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 
 namespace content {
 
 class PepperInProcessRouter::Channel : public IPC::Sender {
@@ skipping 32 matching lines @@
 }
 
 IPC::Sender* PepperInProcessRouter::GetPluginToRendererSender() {
   return plugin_to_host_router_.get();
 }
 
 IPC::Sender* PepperInProcessRouter::GetRendererToPluginSender() {
   return host_to_plugin_router_.get();
 }
 
-ppapi::proxy::Connection PepperInProcessRouter::GetPluginConnection() {
+ppapi::proxy::Connection PepperInProcessRouter::GetPluginConnection(
+    PP_Instance instance) {
+  int routing_id = 0;
+  RenderView* view = host_impl_->GetRenderViewForInstance(instance);
+  if (view)
+    routing_id = view->GetRoutingID();
   return ppapi::proxy::Connection(dummy_browser_channel_.get(),
-                                  plugin_to_host_router_.get());
+                                  plugin_to_host_router_.get(),
+                                  routing_id);
 }
 
 bool PepperInProcessRouter::SendToHost(IPC::Message* msg) {
   scoped_ptr<IPC::Message> message(msg);
 
   if (!message->is_sync()) {
     bool result = host_impl_->GetPpapiHost()->OnMessageReceived(*message);
     DCHECK(result) << "The message was not handled by the host.";
     return true;
   }
@@ skipping 53 matching lines @@
           reply_params.pp_resource());
   if (!resource) {
     // The resource could have been destroyed while the async processing was
     // pending. Just drop the message.
     return;
   }
   resource->OnReplyReceived(reply_params, nested_msg);
 }
 
 }  // namespace content