Index: content/browser/frame_host/render_frame_host_manager.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc |
index 0813bc659df43d9d8dfd9d2f8ed2f1a536747c86..f72910312ad79e371b791e83aa6bbf50e39abaff 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.cc |
+++ b/content/browser/frame_host/render_frame_host_manager.cc |
@@ -916,8 +916,12 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation( |
void RenderFrameHostManager::CleanUpNavigation() { |
CHECK(IsBrowserSideNavigationEnabled()); |
render_frame_host_->ClearPendingWebUI(); |
- if (speculative_render_frame_host_) |
+ if (speculative_render_frame_host_) { |
+ bool was_loading = speculative_render_frame_host_->is_loading(); |
DiscardUnusedFrame(UnsetSpeculativeRenderFrameHost()); |
+ if (was_loading) |
+ frame_tree_node_->DidStopLoading(); |
nasko
2016/01/20 20:58:34
Shouldn't loading state be independent of speculat
clamy
2016/01/22 13:08:15
It has to be dependent of it during the short time
nasko
2016/01/22 17:52:59
Looking at the callers of CleanUpNavigation, it se
|
+ } |
} |
// PlzNavigate |
@@ -1980,6 +1984,7 @@ void RenderFrameHostManager::CommitPending() { |
// now to make sure the sad tab shows up, etc. |
DCHECK(!render_frame_host_->IsRenderFrameLive()); |
DCHECK(!render_frame_host_->render_view_host()->IsRenderViewLive()); |
+ render_frame_host_->ResetLoadingState(); |
delegate_->RenderProcessGoneFromRenderManager( |
render_frame_host_->render_view_host()); |
} |
@@ -2231,7 +2236,11 @@ void RenderFrameHostManager::CancelPending() { |
TRACE_EVENT1("navigation", "RenderFrameHostManager::CancelPending", |
"FrameTreeNode id", frame_tree_node_->frame_tree_node_id()); |
render_frame_host_->ClearPendingWebUI(); |
+ |
+ bool pending_was_loading = pending_render_frame_host_->is_loading(); |
DiscardUnusedFrame(UnsetPendingRenderFrameHost()); |
+ if (pending_was_loading) |
+ frame_tree_node_->DidStopLoading(); |
} |
scoped_ptr<RenderFrameHostImpl> |