Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1805)

Unified Diff: content/browser/frame_host/frame_tree_node.cc

Issue 2768813002: PlzNavigate: don't stop all loaders when renderer-initiated nav fails
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a345b7d41fce7223fa2cf773b9c5261bcd0a3ffe..381d515ad65d49d9fa2ba0d66878860976611c81 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -400,7 +400,8 @@ void FrameTreeNode::ResetNavigationRequest(bool keep_state,
CHECK(IsBrowserSideNavigationEnabled());
if (!navigation_request_)
return;
- bool was_renderer_initiated = !navigation_request_->browser_initiated();
+ int renderer_navigation_id =
+ navigation_request_->begin_params().renderer_navigation_id;
NavigationRequest::AssociatedSiteInstanceType site_instance_type =
navigation_request_->associated_site_instance_type();
navigation_request_.reset();
@@ -422,9 +423,9 @@ void FrameTreeNode::ResetNavigationRequest(bool keep_state,
// If the navigation is renderer-initiated, the renderer should also be
// informed that the navigation stopped.
- if (was_renderer_initiated && inform_renderer) {
- current_frame_host()->Send(
- new FrameMsg_Stop(current_frame_host()->GetRoutingID()));
+ if (renderer_navigation_id != kInvalidRenderNavigationId && inform_renderer) {
+ current_frame_host()->Send(new FrameMsg_DroppedNavigation(
+ current_frame_host()->GetRoutingID(), renderer_navigation_id));
}
}
« no previous file with comments | « no previous file | content/browser/frame_host/navigation_request.cc » ('j') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698