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

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

Issue 1944013003: Move ownership of source SiteInstance to the FrameNavigationEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/browser/frame_host/frame_navigation_entry.cc
diff --git a/content/browser/frame_host/frame_navigation_entry.cc b/content/browser/frame_host/frame_navigation_entry.cc
index 90293581b502af741c82d0e2aa98f27621b7caf9..c400083878cc58b00f4721429237a5f4926fad16 100644
--- a/content/browser/frame_host/frame_navigation_entry.cc
+++ b/content/browser/frame_host/frame_navigation_entry.cc
@@ -35,14 +35,16 @@ FrameNavigationEntry::~FrameNavigationEntry() {
FrameNavigationEntry* FrameNavigationEntry::Clone() const {
FrameNavigationEntry* copy = new FrameNavigationEntry();
copy->UpdateEntry(frame_unique_name_, item_sequence_number_,
- document_sequence_number_, site_instance_.get(), url_,
- referrer_, page_state_, method_, post_id_);
+ document_sequence_number_, source_site_instance_.get(),
+ site_instance_.get(), url_, referrer_, page_state_, method_,
+ post_id_);
return copy;
}
void FrameNavigationEntry::UpdateEntry(const std::string& frame_unique_name,
int64_t item_sequence_number,
int64_t document_sequence_number,
+ SiteInstanceImpl* source_site_instance,
SiteInstanceImpl* site_instance,
const GURL& url,
const Referrer& referrer,
@@ -52,6 +54,7 @@ void FrameNavigationEntry::UpdateEntry(const std::string& frame_unique_name,
frame_unique_name_ = frame_unique_name;
item_sequence_number_ = item_sequence_number;
document_sequence_number_ = document_sequence_number;
+ source_site_instance_ = source_site_instance;
site_instance_ = site_instance;
url_ = url;
referrer_ = referrer;

Powered by Google App Engine
This is Rietveld 408576698