Fix regression of bug 205 where a plugin in a window shown with window.open may not have the correc…

content/browser/renderer_host/render_widget_helper.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/browser/renderer_host/render_widget_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/eintr_wrapper.h"
 #include "base/lazy_instance.h"
@@ skipping 125 matching lines @@
 void RenderWidgetHelper::CrossSiteSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&RenderWidgetHelper::OnCrossSiteSwapOutACK,
                  this,
                  params));
 }
 
 bool RenderWidgetHelper::WaitForBackingStoreMsg(
-    int render_widget_id,
-                                          const base::TimeDelta& max_delay,
-                                          IPC::Message* msg) {
+    int render_widget_id, const base::TimeDelta& max_delay, IPC::Message* msg) {
   base::TimeTicks time_start = base::TimeTicks::Now();
 
   for (;;) {
     BackingStoreMsgProxy* proxy = NULL;
     {
       base::AutoLock lock(pending_paints_lock_);
 
       BackingStoreMsgProxyMap::iterator it =
           pending_paints_.find(render_widget_id);
       if (it != pending_paints_.end()) {
@@ skipping 23 matching lines @@
     if (max_sleep_time <= base::TimeDelta::FromMilliseconds(0))
       break;
 
     base::ThreadRestrictions::ScopedAllowWait allow_wait;
     event_.TimedWait(max_sleep_time);
   }
 
   return false;
 }
 
+void RenderWidgetHelper::ResumeRequestsForView(int route_id) {
+  // We only need to resume blocked requests if we used a valid route_id.
+  // See CreateNewWindow.
+  if (route_id != MSG_ROUTING_NONE) {
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&RenderWidgetHelper::OnResumeRequestsForView,
+            this, route_id));
+  }
+}
+
 void RenderWidgetHelper::DidReceiveBackingStoreMsg(const IPC::Message& msg) {
   int render_widget_id = msg.routing_id();
 
   BackingStoreMsgProxy* proxy = new BackingStoreMsgProxy(this, msg);
   {
     base::AutoLock lock(pending_paints_lock_);
 
     pending_paints_[render_widget_id].push_back(proxy);
   }
 
@@ skipping 79 matching lines @@
 }
 
 void RenderWidgetHelper::OnCreateWindowOnUI(
     const ViewHostMsg_CreateWindow_Params& params,
     int route_id,
     SessionStorageNamespace* session_storage_namespace) {
   RenderViewHostImpl* host =
       RenderViewHostImpl::FromID(render_process_id_, params.opener_id);
   if (host)
     host->CreateNewWindow(route_id, params, session_storage_namespace);
-
-  // We only need to resume blocked requests if we used a valid route_id.
-  // See CreateNewWindow.
-  if (route_id != MSG_ROUTING_NONE) {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&RenderWidgetHelper::OnCreateWindowOnIO, this, route_id));
-  }
 }
 
-void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) {
+void RenderWidgetHelper::OnResumeRequestsForView(int route_id) {
   resource_dispatcher_host_->ResumeBlockedRequestsForRoute(
       render_process_id_, route_id);
 }
 
 void RenderWidgetHelper::CreateNewWidget(int opener_id,
                                          WebKit::WebPopupType popup_type,
                                          int* route_id,
                                          int* surface_id) {
   *route_id = GetNextRoutingID();
   *surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
@@ skipping 85 matching lines @@
        i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
     if (HANDLE_EINTR(close(i->second)) < 0)
       PLOG(ERROR) << "close: " << i->first;
   }
 
   allocated_dibs_.clear();
 }
 #endif
 
 }  // namespace content