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

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 + removed the content_unittests filter 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 546b119998156517090926bdd6a008662d2bfe13..009e0135243ed374c3a305ac46e12974b993e5bc 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);
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl_unittest.cc ('k') | testing/buildbot/chromium.fyi.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698