| Index: content/browser/renderer_host/render_widget_helper.cc
|
| diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc
|
| index 4a37ca58d48b94d78e7b1ddef5969e45726a44f5..a940139484d71d0a7658ee87aad467573052f77d 100644
|
| --- a/content/browser/renderer_host/render_widget_helper.cc
|
| +++ b/content/browser/renderer_host/render_widget_helper.cc
|
| @@ -82,14 +82,14 @@ void RenderWidgetHelper::ResumeDeferredNavigation(
|
| request_id));
|
| }
|
|
|
| -void RenderWidgetHelper::ResumeRequestsForView(int route_id) {
|
| +void RenderWidgetHelper::ResumeRequestsForFrame(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));
|
| + base::Bind(&RenderWidgetHelper::OnResumeRequestsForFrame, this,
|
| + route_id));
|
| }
|
| }
|
|
|
| @@ -122,10 +122,10 @@ void RenderWidgetHelper::CreateNewWindow(
|
| // should be updated to give the widget a distinct routing ID.
|
| // https://crbug.com/545684
|
| *main_frame_widget_route_id = *route_id;
|
| - // Block resource requests until the view is created, since the HWND might
|
| + // Block resource requests until the frame is created, since the HWND might
|
| // be needed if a response ends up creating a plugin.
|
| - resource_dispatcher_host_->BlockRequestsForRoute(
|
| - render_process_id_, *route_id);
|
| + resource_dispatcher_host_->BlockRequestsForFrame(render_process_id_,
|
| + *main_frame_route_id);
|
| }
|
|
|
| BrowserThread::PostTask(
|
| @@ -149,9 +149,9 @@ void RenderWidgetHelper::OnCreateWindowOnUI(
|
| session_storage_namespace);
|
| }
|
|
|
| -void RenderWidgetHelper::OnResumeRequestsForView(int route_id) {
|
| - resource_dispatcher_host_->ResumeBlockedRequestsForRoute(
|
| - render_process_id_, route_id);
|
| +void RenderWidgetHelper::OnResumeRequestsForFrame(int route_id) {
|
| + resource_dispatcher_host_->ResumeBlockedRequestsForFrame(render_process_id_,
|
| + route_id);
|
| }
|
|
|
| void RenderWidgetHelper::CreateNewWidget(int opener_id,
|
|
|