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

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

Issue 1225593003: OOPIF: Fix willSendRequest in A-B-A nested case. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also fix cross-process location.replace Created 5 years, 5 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/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 321aaeac80253402894b3e0a816d83a00f87001c..cc6fb574cdd7fec6dfe0a2b4deb9d3a8e1e1d174 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1177,10 +1177,7 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage(
if (ui::PageTransitionIsRedirect(params.transition))
entry->GetFavicon() = FaviconStatus();
- // The site instance will normally be the same except during session restore,
- // when no site instance will be assigned.
- DCHECK(entry->site_instance() == NULL ||
- entry->site_instance() == rfh->GetSiteInstance());
+ // The SiteInstance can change for cross-process location.replace navigations.
entry->set_site_instance(
static_cast<SiteInstanceImpl*>(rfh->GetSiteInstance()));

Powered by Google App Engine
This is Rietveld 408576698