Instead of queuing ResourceDispatcher IPC messages in RenderView, use ResourceDispatcherHost's ability to block requests for a given route in the browser process. This is in prepration for switching to one ResourceDispatcher in the renderer process, instead of one per RenderView, to share more code between child processes.

I realize that this means that resource requests for RenderViews created by other RenderViews will start a little bit later now (after a hop to the UI thread and back), but I don't think it should lead to much delay (since if our UI thread is that bogged down, we have bigger problems).  I'll make sure this is the case by looking at the page cyclers.

Review URL: http://codereview.chromium.org/42005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11370 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 47 insertions, 19 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 8fb8108..03bdbc8 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -134,7 +134,8 @@ BrowserRenderProcessHost::BrowserRenderProcessHost(Profile* profile)
             base::TimeDelta::FromSeconds(5),
             this, &BrowserRenderProcessHost::ClearTransportDIBCache)) {
   DCHECK(host_id() >= 0);  // We use a negative host_id_ in destruction.
-  widget_helper_ = new RenderWidgetHelper(host_id());
+  widget_helper_ = new RenderWidgetHelper(
+      host_id(), g_browser_process->resource_dispatcher_host());
 
   CacheManagerHost::GetInstance()->Add(host_id());
   RendererSecurityPolicy::GetInstance()->Add(host_id());
diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index 24e1710..eabfe58 100644
--- a/chrome/browser/renderer_host/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.cc
@@ -41,7 +41,8 @@ class RenderWidgetHelper::PaintMsgProxy : public Task {
   DISALLOW_COPY_AND_ASSIGN(PaintMsgProxy);
 };
 
-RenderWidgetHelper::RenderWidgetHelper(int render_process_id)
+RenderWidgetHelper::RenderWidgetHelper(
+    int render_process_id, ResourceDispatcherHost* resource_dispatcher_host)
     : render_process_id_(render_process_id),
       ui_loop_(MessageLoop::current()),
 #if defined(OS_WIN)
@@ -49,7 +50,8 @@ RenderWidgetHelper::RenderWidgetHelper(int render_process_id)
 #elif defined(OS_POSIX)
       event_(false /* auto-reset */, false),
 #endif
-      block_popups_(false) {
+      block_popups_(false),
+      resource_dispatcher_host_(resource_dispatcher_host) {
 }
 
 RenderWidgetHelper::~RenderWidgetHelper() {
@@ -71,7 +73,6 @@ void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this,
                           &RenderWidgetHelper::OnCancelResourceRequests,
-                          g_browser_process->resource_dispatcher_host(),
                           render_widget_id));
   }
 }
@@ -82,7 +83,6 @@ void RenderWidgetHelper::CrossSiteClosePageACK(int new_render_process_host_id,
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this,
                           &RenderWidgetHelper::OnCrossSiteClosePageACK,
-                          g_browser_process->resource_dispatcher_host(),
                           new_render_process_host_id,
                           new_request_id));
   }
@@ -183,16 +183,16 @@ void RenderWidgetHelper::OnDispatchPaintMsg(PaintMsgProxy* proxy) {
 }
 
 void RenderWidgetHelper::OnCancelResourceRequests(
-    ResourceDispatcherHost* dispatcher,
     int render_widget_id) {
-  dispatcher->CancelRequestsForRenderView(render_process_id_, render_widget_id);
+  resource_dispatcher_host_->CancelRequestsForRenderView(
+      render_process_id_, render_widget_id);
 }
 
 void RenderWidgetHelper::OnCrossSiteClosePageACK(
-    ResourceDispatcherHost* dispatcher,
     int new_render_process_host_id,
     int new_request_id) {
-  dispatcher->OnClosePageACK(new_render_process_host_id, new_request_id);
+  resource_dispatcher_host_->OnClosePageACK(
+      new_render_process_host_id, new_request_id);
 }
 
 void RenderWidgetHelper::CreateNewWindow(int opener_id,
@@ -225,12 +225,32 @@ void RenderWidgetHelper::CreateNewWindow(int opener_id,
   DCHECK(result) << "Couldn't duplicate modal dialog event for the renderer.";
 #endif
 
+  // Block resource requests until the view is created, since the HWND might be
+  // needed if a response ends up creating a plugin.
+  resource_dispatcher_host_->BlockRequestsForRenderView(
+      render_process_id_, *route_id);
+
   // The easiest way to reach RenderViewHost is just to send a routed message.
   ViewHostMsg_CreateWindowWithRoute msg(opener_id, *route_id,
                                         modal_dialog_event_internal);
 
   ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &RenderWidgetHelper::OnSimulateReceivedMessage, msg));
+      this, &RenderWidgetHelper::OnCreateWindowOnUI, msg, *route_id));
+}
+
+void RenderWidgetHelper::OnCreateWindowOnUI(
+    const IPC::Message& message, int route_id) {
+  RenderProcessHost* host = RenderProcessHost::FromID(render_process_id_);
+  if (host)
+    host->OnMessageReceived(message);
+
+  g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
+      NewRunnableMethod(this, &RenderWidgetHelper::OnCreateWindowOnIO, route_id));
+}
+
+void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) {
+  resource_dispatcher_host_->ResumeBlockedRequestsForRenderView(
+      render_process_id_, route_id);
 }
 
 void RenderWidgetHelper::CreateNewWidget(int opener_id,
@@ -239,10 +259,10 @@ void RenderWidgetHelper::CreateNewWidget(int opener_id,
   *route_id = GetNextRoutingID();
   ViewHostMsg_CreateWidgetWithRoute msg(opener_id, *route_id, activatable);
   ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &RenderWidgetHelper::OnSimulateReceivedMessage, msg));
+      this, &RenderWidgetHelper::OnCreateWidgetOnUI, msg));
 }
 
-void RenderWidgetHelper::OnSimulateReceivedMessage(
+void RenderWidgetHelper::OnCreateWidgetOnUI(
     const IPC::Message& message) {
   RenderProcessHost* host = RenderProcessHost::FromID(render_process_id_);
   if (host)
diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h
index 317a72e..a3aa321 100644
--- a/chrome/browser/renderer_host/render_widget_helper.h
+++ b/chrome/browser/renderer_host/render_widget_helper.h
@@ -86,7 +86,8 @@ class ResourceDispatcherHost;
 class RenderWidgetHelper :
     public base::RefCountedThreadSafe<RenderWidgetHelper> {
  public:
-  RenderWidgetHelper(int render_process_id);
+  RenderWidgetHelper(int render_process_id,
+                     ResourceDispatcherHost* resource_dispatcher_host);
   ~RenderWidgetHelper();
 
   // Gets the next available routing id.  This is thread safe.
@@ -151,16 +152,20 @@ class RenderWidgetHelper :
   // Called on the UI thread to dispatch a paint message if necessary.
   void OnDispatchPaintMsg(PaintMsgProxy* proxy);
 
-  // Called on the UI thread to send a message to the RenderProcessHost.
-  void OnSimulateReceivedMessage(const IPC::Message& message);
+  // Called on the UI thread to finish creating a window.
+  void OnCreateWindowOnUI(const IPC::Message& message, int route_id);
+
+  // Called on the IO thread after a window was created on the UI thread.
+  void OnCreateWindowOnIO(int route_id);
+
+  // Called on the UI thread to finish creating a widget.
+  void OnCreateWidgetOnUI(const IPC::Message& message);
 
   // Called on the IO thread to cancel resource requests for the render widget.
-  void OnCancelResourceRequests(ResourceDispatcherHost* dispatcher,
-                                int render_widget_id);
+  void OnCancelResourceRequests(int render_widget_id);
 
   // Called on the IO thread to resume a cross-site response.
-  void OnCrossSiteClosePageACK(ResourceDispatcherHost* dispatcher,
-                               int new_render_process_host_id,
+  void OnCrossSiteClosePageACK(int new_render_process_host_id,
                                int new_request_id);
 
 #if defined(OS_MACOSX)
@@ -191,6 +196,8 @@ class RenderWidgetHelper :
   // Whether popup blocking is enabled or not.
   bool block_popups_;
 
+  ResourceDispatcherHost* resource_dispatcher_host_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };