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 2f36dfb70e4bc7742b8e4f41ecef425938e2832c..01404869b5eaf343950191c3c01473fa8b08ad5f 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.cc |
+++ b/content/browser/frame_host/render_frame_host_manager.cc |
@@ -1132,8 +1132,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(); |
+ } |
} |
// PlzNavigate |
@@ -2485,7 +2489,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> |