Chromium Code Reviews| Index: content/browser/frame_host/frame_tree_node.cc |
| diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc |
| index 2fdd79c55b1d9dc58ea8b75bce1127ca4e190dbb..a345b7d41fce7223fa2cf773b9c5261bcd0a3ffe 100644 |
| --- a/content/browser/frame_host/frame_tree_node.cc |
| +++ b/content/browser/frame_host/frame_tree_node.cc |
| @@ -384,7 +384,7 @@ void FrameTreeNode::CreatedNavigationRequest( |
| // RenderFrameHostManager will take care of updates to the speculative |
| // RenderFrameHost in DidCreateNavigationRequest below. |
| if (was_previously_loading) |
| - ResetNavigationRequest(true); |
| + ResetNavigationRequest(true, true); |
| navigation_request_ = std::move(navigation_request); |
| render_manager()->DidCreateNavigationRequest(navigation_request_.get()); |
| @@ -395,7 +395,8 @@ void FrameTreeNode::CreatedNavigationRequest( |
| DidStartLoading(to_different_document, was_previously_loading); |
| } |
| -void FrameTreeNode::ResetNavigationRequest(bool keep_state) { |
| +void FrameTreeNode::ResetNavigationRequest(bool keep_state, |
| + bool inform_renderer) { |
| CHECK(IsBrowserSideNavigationEnabled()); |
| if (!navigation_request_) |
| return; |
| @@ -421,7 +422,7 @@ void FrameTreeNode::ResetNavigationRequest(bool keep_state) { |
| // If the navigation is renderer-initiated, the renderer should also be |
| // informed that the navigation stopped. |
|
Charlie Reis
2017/03/22 23:54:41
nit: Update comment, maybe giving an example of wh
clamy
2017/03/23 13:17:52
Done.
|
| - if (was_renderer_initiated) { |
| + if (was_renderer_initiated && inform_renderer) { |
| current_frame_host()->Send( |
| new FrameMsg_Stop(current_frame_host()->GetRoutingID())); |
| } |
| @@ -500,7 +501,7 @@ bool FrameTreeNode::StopLoading() { |
| navigation_request_->navigation_handle()->set_net_error_code( |
| net::ERR_ABORTED); |
| } |
| - ResetNavigationRequest(false); |
| + ResetNavigationRequest(false, true); |
| } |
| // TODO(nasko): see if child frames should send IPCs in site-per-process |