Index: content/browser/frame_host/render_frame_host_impl.cc |
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
index 1834494ead535676362949f0cf7c26ba5d421c80..75c3c7aa82b5b764a53a7c33585ff8c904cef9ed 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -34,6 +34,7 @@ |
#include "content/browser/frame_host/render_frame_proxy_host.h" |
#include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
#include "content/browser/geolocation/geolocation_service_context.h" |
+#include "content/browser/loader/resource_dispatcher_host_impl.h" |
#include "content/browser/permissions/permission_service_context.h" |
#include "content/browser/permissions/permission_service_impl.h" |
#include "content/browser/presentation/presentation_service_impl.h" |
@@ -62,6 +63,7 @@ |
#include "content/public/browser/browser_plugin_guest_manager.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/content_browser_client.h" |
+#include "content/public/browser/loader_io_thread_notifier.h" |
#include "content/public/browser/permission_manager.h" |
#include "content/public/browser/permission_type.h" |
#include "content/public/browser/render_process_host.h" |
@@ -765,9 +767,7 @@ void RenderFrameHostImpl::SetRenderFrameCreated(bool created) { |
} |
void RenderFrameHostImpl::Init() { |
- // TODO(csharrison): Call GetProcess()->ResumeRequestsForFrame(routing_id_) |
- // once ResourceDispatcherHostImpl is keyed on render frame routing ids |
- // instead of render view routing ids. |
+ LoaderIOThreadNotifier::ResumeBlockedRequestsForFrame(this); |
} |
void RenderFrameHostImpl::OnAddMessageToConsole( |
@@ -1063,6 +1063,10 @@ RenderWidgetHostView* RenderFrameHostImpl::GetView() { |
return nullptr; |
} |
+GlobalFrameRoutingId RenderFrameHostImpl::GetGlobalFrameRoutingId() { |
+ return GlobalFrameRoutingId(GetProcess()->GetID(), GetRoutingID()); |
+} |
+ |
int RenderFrameHostImpl::GetEnabledBindings() { |
return render_view_host_->GetEnabledBindings(); |
} |