Allow renderer to create pepper ResourceHosts in the browser

ppapi/host/ppapi_host.cc

Index: ppapi/host/ppapi_host.cc
diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc
index 0b24e10d7d3b826934339c9972e6953c4cb94da3..5d286f3314d30f3844c0f4fa8c33144abf6544c2 100644
--- a/ppapi/host/ppapi_host.cc
+++ b/ppapi/host/ppapi_host.cc
@@ -99,9 +99,32 @@ void PpapiHost::SendUnsolicitedReply(PP_Resource resource,
   Send(new PpapiPluginMsg_ResourceReply(params, msg));
 }
 
+scoped_ptr<ResourceHost> PpapiHost::CreateResourceHost(
+    const proxy::ResourceMessageCallParams& params,
+    PP_Instance instance,
+    const IPC::Message& nested_msg) {
+  scoped_ptr<ResourceHost> resource_host;
+  DCHECK(!host_factory_filters_.empty());  // Caller forgot to add a factory.
+  for (size_t i = 0; i < host_factory_filters_.size(); i++) {
+    resource_host = host_factory_filters_[i]->CreateResourceHost(
+        this, params, instance, nested_msg).Pass();
+    if (resource_host.get())
+      break;
+  }
+  return resource_host.Pass();
+}
+
 int PpapiHost::AddPendingResourceHost(scoped_ptr<ResourceHost> resource_host) {
   // The resource ID should not be assigned.
-  DCHECK(resource_host->pp_resource() == 0);
+  if (!resource_host.get() || resource_host->pp_resource() != 0) {
+    NOTREACHED();
+    return 0;
+  }
+
+  if (pending_resource_hosts_.size() + resources_.size()
+      >= kMaxResourcesPerPlugin) {
+    return 0;
+  }
 
   int pending_id = next_pending_resource_host_id_++;
   pending_resource_hosts_[pending_id] =
@@ -168,18 +191,16 @@ void PpapiHost::OnHostMsgResourceCreated(
   TRACE_EVENT2("ppapi proxy", "PpapiHost::OnHostMsgResourceCreated",
                "Class", IPC_MESSAGE_ID_CLASS(nested_msg.type()),
                "Line", IPC_MESSAGE_ID_LINE(nested_msg.type()));
-  if (resources_.size() >= kMaxResourcesPerPlugin)
+
+  if (pending_resource_hosts_.size() + resources_.size()
+      >= kMaxResourcesPerPlugin) {
     return;
+  }
 
   // Run through all filters until one grabs this message.
-  scoped_ptr<ResourceHost> resource_host;
-  DCHECK(!host_factory_filters_.empty());  // Caller forgot to add a factory.
-  for (size_t i = 0; i < host_factory_filters_.size(); i++) {
-    resource_host = host_factory_filters_[i]->CreateResourceHost(
-        this, params, instance, nested_msg).Pass();
-    if (resource_host.get())
-      break;
-  }
+  scoped_ptr<ResourceHost> resource_host = CreateResourceHost(params, instance,
+                                                              nested_msg);
+
   if (!resource_host.get()) {
     NOTREACHED();
     return;
@@ -202,6 +223,8 @@ void PpapiHost::OnHostMsgAttachToPendingHost(PP_Resource pp_resource,
     return;
   }
   found->second->SetPPResourceForPendingHost(pp_resource);
+  if (resources_.size() >= kMaxResourcesPerPlugin)
+    return;

[teravest, 2013/05/29 15:19:36]

What should callers of AttachToPendingHost() do to detect this case? Since the
information remains in pending_resource_hosts_, it looks like you're allowing
the caller to retry on failure, but I don't know how it would be detected.

[raymes, 2013/05/29 15:53:03]

Oops this shouldn't be here. I already added the checks in the 2 places where we
add things to the map.

   resources_[pp_resource] = found->second;
   pending_resource_hosts_.erase(found);
 }