Modify Pepper CreateResourceHostFromHost to create multiple hosts.

content/browser/renderer_host/pepper/pepper_renderer_connection.cc

 // Copyright 2013 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/browser/renderer_host/pepper/pepper_renderer_connection.h"
 
 #include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/ppapi_plugin_process_host.h"
 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
 #include "content/common/pepper_renderer_instance_data.h"
@@ skipping 54 matching lines @@
   return host;
 }
 
 bool PepperRendererConnection::OnMessageReceived(const IPC::Message& msg,
                                                  bool* message_was_ok) {
   if (in_process_host_->GetPpapiHost()->OnMessageReceived(msg))
     return true;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(PepperRendererConnection, msg, *message_was_ok)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_CreateResourceHostFromHost,
-                        OnMsgCreateResourceHostFromHost)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_CreateResourceHostsFromHost,
+                        OnMsgCreateResourceHostsFromHost)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_FileRef_GetInfoForRenderer,
                         OnMsgFileRefGetInfoForRenderer)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidCreateInProcessInstance,
                         OnMsgDidCreateInProcessInstance)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidDeleteInProcessInstance,
                         OnMsgDidDeleteInProcessInstance)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
-void PepperRendererConnection::OnMsgCreateResourceHostFromHost(
+void PepperRendererConnection::OnMsgCreateResourceHostsFromHost(
     int routing_id,
     int child_process_id,
     const ppapi::proxy::ResourceMessageCallParams& params,
     PP_Instance instance,
-    const IPC::Message& nested_msg) {
+    const std::vector<IPC::Message>& nested_msgs) {
   BrowserPpapiHostImpl* host = GetHostForChildProcess(child_process_id);
 
-  int pending_resource_host_id;
+  std::vector<int> pending_resource_host_ids(nested_msgs.size(), 0);
   if (!host) {
     DLOG(ERROR) << "Invalid plugin process ID.";
-    pending_resource_host_id = 0;
   } else {
-    // FileRef_CreateExternal is only permitted from the renderer. Because of
-    // this, we handle this message here and not in
-    // content_browser_pepper_host_factory.cc.
-    scoped_ptr<ppapi::host::ResourceHost> resource_host;
-    if (host->IsValidInstance(instance)) {
-      if (nested_msg.type() == PpapiHostMsg_FileRef_CreateExternal::ID) {
-        base::FilePath external_path;
-        if (ppapi::UnpackMessage<PpapiHostMsg_FileRef_CreateExternal>(
-            nested_msg, &external_path)) {
-          resource_host.reset(new PepperFileRefHost(
-              host, instance, params.pp_resource(), external_path));
+    for (size_t i = 0; i < nested_msgs.size(); ++i) {
+      // FileRef_CreateExternal is only permitted from the renderer. Because of
+      // this, we handle this message here and not in
+      // content_browser_pepper_host_factory.cc.
+      scoped_ptr<ppapi::host::ResourceHost> resource_host;
+      if (host->IsValidInstance(instance)) {
+        if (nested_msgs[i].type() == PpapiHostMsg_FileRef_CreateExternal::ID) {
+          base::FilePath external_path;
+          if (ppapi::UnpackMessage<PpapiHostMsg_FileRef_CreateExternal>(
+              nested_msgs[i], &external_path)) {
+            resource_host.reset(new PepperFileRefHost(
+                host, instance, params.pp_resource(), external_path));
+          }
         }
       }
+
+      if (!resource_host.get()) {
+        resource_host = host->GetPpapiHost()->CreateResourceHost(
+            params, instance, nested_msgs[i]);
+      }
+
+      if (resource_host.get()) {
+        pending_resource_host_ids[i] =
+            host->GetPpapiHost()->AddPendingResourceHost(resource_host.Pass());
+      }
     }
-
-    if (!resource_host.get()) {
-      resource_host = host->GetPpapiHost()->CreateResourceHost(params,
-                                                               instance,
-                                                               nested_msg);
-    }
-    pending_resource_host_id =
-        host->GetPpapiHost()->AddPendingResourceHost(resource_host.Pass());
   }
 
-  Send(new PpapiHostMsg_CreateResourceHostFromHostReply(
-       routing_id, params.sequence(), pending_resource_host_id));
+  Send(new PpapiHostMsg_CreateResourceHostsFromHostReply(
+       routing_id, params.sequence(), pending_resource_host_ids));
 }
 
 void PepperRendererConnection::OnMsgFileRefGetInfoForRenderer(
     int routing_id,
     int child_process_id,
     int32_t sequence,
     const std::vector<PP_Resource>& resources) {
   std::vector<PP_Resource> out_resources;
   std::vector<PP_FileSystemType> fs_types;
   std::vector<std::string> file_system_url_specs;
@@ skipping 30 matching lines @@
   data.render_process_id = render_process_id_;
   in_process_host_->AddInstance(instance, data);
 }
 
 void PepperRendererConnection::OnMsgDidDeleteInProcessInstance(
     PP_Instance instance) {
   in_process_host_->DeleteInstance(instance);
 }
 
 }  // namespace content