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

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

Issue 1944013003: Move ownership of source SiteInstance to the FrameNavigationEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another round of review comments addressed. Created 4 years, 7 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 | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/navigator_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_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 1139604533b8c68a1d9239703294f9edc0664e5f..3ed4510f56f7d6f6c77d83fa6cda73449e46727f 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -166,9 +166,10 @@ NavigationRequest::NavigationRequest(
associated_site_instance_type_(AssociatedSiteInstanceType::NONE) {
DCHECK(!browser_initiated || (entry != nullptr && frame_entry != nullptr));
if (browser_initiated) {
- // TODO(clamy): use the FrameNavigationEntry for the source SiteInstance
- // once it has been moved from the NavigationEntry.
- source_site_instance_ = entry->source_site_instance();
+ FrameNavigationEntry* frame_entry = entry->GetFrameEntry(frame_tree_node);
+ if (frame_entry)
+ source_site_instance_ = frame_entry->source_site_instance();
+
dest_site_instance_ = frame_entry->site_instance();
restore_type_ = entry->restore_type();
is_view_source_ = entry->IsViewSourceMode();
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698