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 ff3c1382cf72be50421641755221f429c984fe8d..43bb34341275cba521947646e617f021483c4fe5 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -631,15 +631,14 @@ void RenderFrameHostImpl::OnCrossSiteResponse( |
void RenderFrameHostImpl::OnDeferredAfterResponseStarted( |
const GlobalRequestID& global_request_id, |
- const scoped_refptr<net::HttpResponseHeaders>& headers, |
- const GURL& url) { |
+ const TransitionLayerData& transition_data) { |
frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted( |
global_request_id, this); |
if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted()) |
frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart(); |
else |
- delegate_->DidDeferAfterResponseStarted(headers, url); |
+ delegate_->DidDeferAfterResponseStarted(transition_data); |
} |
void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) { |
@@ -1164,17 +1163,15 @@ RenderFrameHostImpl::GetParentNativeViewAccessible() const { |
} |
#endif // defined(OS_WIN) |
-void RenderFrameHostImpl::SetHasPendingTransitionRequest( |
- bool has_pending_request) { |
+void RenderFrameHostImpl::ClearPendingTransitionRequestData() { |
BrowserThread::PostTask( |
BrowserThread::IO, |
FROM_HERE, |
base::Bind( |
- &TransitionRequestManager::SetHasPendingTransitionRequest, |
+ &TransitionRequestManager::ClearPendingTransitionRequestData, |
base::Unretained(TransitionRequestManager::GetInstance()), |
GetProcess()->GetID(), |
- routing_id_, |
- has_pending_request)); |
+ routing_id_)); |
} |
} // namespace content |