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

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

Issue 2735183003: PlzNavigate: stop navigations when opening a document for write (Closed)
Patch Set: Rebase 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 2fdd79c55b1d9dc58ea8b75bce1127ca4e190dbb..66890c4e6a48db1c3b14096150396eb4f9624be3 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -399,7 +399,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();
@@ -421,9 +422,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) {
- current_frame_host()->Send(
- new FrameMsg_Stop(current_frame_host()->GetRoutingID()));
+ if (renderer_navigation_id != kInvalidRenderNavigationId) {
+ 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') | content/browser/frame_host/navigator_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698