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

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

Issue 2246363003: [DO NOT COMMIT] Test implementation of converting same URL navigation into a reload Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and logging. Created 4 years, 3 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index da3494b37c20e406ae12e05d2c6267cde01a5c38..5043578712966555b9284a3f341301bf639dc7f1 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1828,6 +1828,14 @@ void NavigationControllerImpl::NavigateToPendingEntry(ReloadType reload_type) {
}
}
+ if (GetLastCommittedEntry() && reload_type == NO_RELOAD) {
+ if (pending_entry_->GetURL() == GetLastCommittedEntry()->GetURL()) {
+ DiscardNonCommittedEntries();
+ ReloadInternal(false, RELOAD);
+ return;
+ }
+ }
+
// This call does not support re-entrancy. See http://crbug.com/347742.
CHECK(!in_navigate_to_pending_entry_);
in_navigate_to_pending_entry_ = true;
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698