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

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

Issue 1102563003: Fill in FrameNavigationEntries for auto subframe navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes Created 5 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 a33f9732b3c6c77d4437e435cc2eae9223b92dd8..02af2af9ce95b13763d2eb2496c90f3b351ffb01 100644
--- a/content/browser/frame_host/frame_navigation_entry.cc
+++ b/content/browser/frame_host/frame_navigation_entry.cc
@@ -6,26 +6,35 @@
namespace content {
-FrameNavigationEntry::FrameNavigationEntry() {
+FrameNavigationEntry::FrameNavigationEntry(int64 frame_tree_node_id)
+ : frame_tree_node_id_(frame_tree_node_id) {
}
-FrameNavigationEntry::FrameNavigationEntry(SiteInstanceImpl* site_instance,
+FrameNavigationEntry::FrameNavigationEntry(int64 frame_tree_node_id,
+ SiteInstanceImpl* site_instance,
const GURL& url,
const Referrer& referrer)
- : site_instance_(site_instance), url_(url), referrer_(referrer) {
+ : frame_tree_node_id_(frame_tree_node_id),
+ site_instance_(site_instance),
+ url_(url),
+ referrer_(referrer) {
}
FrameNavigationEntry::~FrameNavigationEntry() {
}
FrameNavigationEntry* FrameNavigationEntry::Clone() const {
- FrameNavigationEntry* copy = new FrameNavigationEntry();
-
- copy->site_instance_ = site_instance_;
- copy->url_ = url_;
- copy->referrer_ = referrer_;
-
+ FrameNavigationEntry* copy = new FrameNavigationEntry(frame_tree_node_id_);
+ copy->UpdateEntry(site_instance_.get(), url_, referrer_);
return copy;
}
+void FrameNavigationEntry::UpdateEntry(SiteInstanceImpl* site_instance,
+ const GURL& url,
+ const Referrer& referrer) {
+ site_instance_ = site_instance;
+ url_ = url;
+ referrer_ = referrer;
+}
+
} // namespace content
« no previous file with comments | « content/browser/frame_host/frame_navigation_entry.h ('k') | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698