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

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

Issue 600553003: Enable swapping a frame back in to its parent process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remoteToLocal
Patch Set: Created 6 years, 2 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 39799b9c099cbc9297567e14ea61886f554c1ae8..18f01180fcce5ea8d895e817af3c7563cef4f583 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -932,7 +932,7 @@ SiteInstance* RenderFrameHostManager::GetSiteInstanceForURL(
// to open a new tab to an interstitial-inducing URL, and then navigates
// the page to a different same-site URL. (This seems very unlikely in
// practice.)
- const GURL& current_url = (current_entry) ? current_entry->GetURL() :
+ const GURL& current_url = (current_entry) ? frame_tree_node_->current_url() :
Charlie Reis 2014/10/28 16:38:29 I'm a little nervous about this because I don't tr
Nate Chapin 2014/10/28 19:59:19 Ok, will split out and land that first.
current_instance->GetSiteURL();
// View-source URLs must use a new SiteInstance and BrowsingInstance.

Powered by Google App Engine
This is Rietveld 408576698