summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/resource_dispatcher_host_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/renderer_host/resource_dispatcher_host_impl.cc')
-rw-r--r--content/browser/renderer_host/resource_dispatcher_host_impl.cc21
1 files changed, 3 insertions, 18 deletions
diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
index 95e0f3ed..373a792 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
@@ -288,13 +288,11 @@ net::RequestPriority DetermineRequestPriority(ResourceType::Type type) {
}
}
-void OnSwapOutACKHelper(int render_process_id,
- int render_view_id,
- bool timed_out) {
+void OnSwapOutACKHelper(int render_process_id, int render_view_id) {
RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(render_process_id,
render_view_id);
if (rvh)
- rvh->OnSwapOutACK(timed_out);
+ rvh->OnSwapOutACK();
}
net::Error CallbackAndReturn(
@@ -1085,20 +1083,8 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
context);
}
-
void ResourceDispatcherHostImpl::OnSwapOutACK(
- const ViewMsg_SwapOut_Params& params) {
- HandleSwapOutACK(params, false);
-}
-
-void ResourceDispatcherHostImpl::OnSimulateSwapOutACK(
const ViewMsg_SwapOut_Params& params) {
- // Call the real implementation with true, which means that we timed out.
- HandleSwapOutACK(params, true);
-}
-
-void ResourceDispatcherHostImpl::HandleSwapOutACK(
- const ViewMsg_SwapOut_Params& params, bool timed_out) {
// Closes for cross-site transitions are handled such that the cross-site
// transition continues.
GlobalRequestID global_id(params.new_render_process_host_id,
@@ -1117,8 +1103,7 @@ void ResourceDispatcherHostImpl::HandleSwapOutACK(
FROM_HERE,
base::Bind(&OnSwapOutACKHelper,
params.closing_process_id,
- params.closing_route_id,
- timed_out));
+ params.closing_route_id));
}
void ResourceDispatcherHostImpl::OnDidLoadResourceFromMemoryCache(