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

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

Issue 2735183003: PlzNavigate: stop navigations when opening a document for write (Closed)
Patch Set: Addressed commemts 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/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 3a98b03f2430d58d029712a28d04846caf948f84..7d69b4f34014188404560dfb7c54bd8dbbe51e70 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -468,7 +468,7 @@ void RenderFrameHostManager::CommitPendingIfNecessary(
// commit call below.
CommitPending();
if (IsBrowserSideNavigationEnabled())
- frame_tree_node_->ResetNavigationRequest(false);
+ frame_tree_node_->ResetNavigationRequest(false, true);
} else if (render_frame_host == render_frame_host_.get()) {
// A same-process navigation committed while a simultaneous cross-process
// navigation is still ongoing.
@@ -484,7 +484,7 @@ void RenderFrameHostManager::CommitPendingIfNecessary(
if (was_caused_by_user_gesture) {
if (IsBrowserSideNavigationEnabled()) {
CleanUpNavigation();
- frame_tree_node_->ResetNavigationRequest(false);
+ frame_tree_node_->ResetNavigationRequest(false, true);
} else {
CancelPending();
}
@@ -1003,7 +1003,7 @@ void RenderFrameHostManager::CancelPendingIfNecessary(
else if (render_frame_host == speculative_render_frame_host_.get()) {
// TODO(nasko, clamy): This should just clean up the speculative RFH
// without canceling the request. See https://crbug.com/636119.
- frame_tree_node_->ResetNavigationRequest(false);
+ frame_tree_node_->ResetNavigationRequest(false, true);
}
}
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698