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

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

Issue 1872313003: PlzNavigate: don't discard pending entry in DidFailProvisionalLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + addressed comments Created 4 years, 8 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/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 6afb53557d27cc587d113398d3a48b0f2072e129..dadc2200b9570b55982921eddc380f2a8a612566 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -227,7 +227,12 @@ void NavigatorImpl::DidFailProvisionalLoadWithError(
// TODO(creis): Find a way to cancel any pending RFH here.
}
- DiscardPendingEntryOnFailureIfNeeded(render_frame_host->navigation_handle());
+ // Discard the pending navigation entry if needed.
+ // PlzNavigate: the entry has already been discarded in FailedNavigation.
+ if (!IsBrowserSideNavigationEnabled()) {
+ DiscardPendingEntryOnFailureIfNeeded(
+ render_frame_host->navigation_handle());
+ }
if (delegate_)
delegate_->DidFailProvisionalLoadWithError(render_frame_host, params);

Powered by Google App Engine
This is Rietveld 408576698