Add NavigationEntryImpl::TreeNode for tracking FrameNavigationEntries.

content/browser/frame_host/navigation_entry_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/common/navigation_params.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/text_elider.h"
 
 // Use this to get a new unique ID for a NavigationEntry during construction.
 // The returned ID is guaranteed to be nonzero (which is the "no ID" indicator).
 static int GetUniqueIDInConstructor() {
   static int unique_id_counter = 0;
   return ++unique_id_counter;
 }
 
 namespace content {
 
 int NavigationEntryImpl::kInvalidBindings = -1;
 
+NavigationEntryImpl::TreeNode::TreeNode(FrameNavigationEntry* frame_entry)
+    : frame_entry(frame_entry) {
+}
+
+NavigationEntryImpl::TreeNode::~TreeNode() {
+}
+
+NavigationEntryImpl::TreeNode* NavigationEntryImpl::TreeNode::Clone() const {
+  // Clone the tree using a copy of the FrameNavigationEntry, without sharing.
+  NavigationEntryImpl::TreeNode* copy =
+      new NavigationEntryImpl::TreeNode(frame_entry->Clone());
+
+  // TODO(creis): Clone children once we add them.
+  return copy;
+}
+
 NavigationEntry* NavigationEntry::Create() {
   return new NavigationEntryImpl();
 }
 
 NavigationEntryImpl* NavigationEntryImpl::FromNavigationEntry(
     NavigationEntry* entry) {
   return static_cast<NavigationEntryImpl*>(entry);
 }
 
 NavigationEntryImpl::NavigationEntryImpl()
     : NavigationEntryImpl(nullptr, -1, GURL(), Referrer(), base::string16(),
                           ui::PAGE_TRANSITION_LINK, false) {
 }
 
 NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
                                          int page_id,
                                          const GURL& url,
                                          const Referrer& referrer,
                                          const base::string16& title,
                                          ui::PageTransition transition_type,
                                          bool is_renderer_initiated)
-    : frame_entry_(instance, url, referrer),
+    : frame_tree_(
+          new TreeNode(new FrameNavigationEntry(instance, url, referrer))),
       unique_id_(GetUniqueIDInConstructor()),
       bindings_(kInvalidBindings),
       page_type_(PAGE_TYPE_NORMAL),
       update_virtual_url_with_url_(false),
       title_(title),
       page_id_(page_id),
       transition_type_(transition_type),
       has_post_data_(false),
       post_id_(-1),
       restore_type_(RESTORE_NONE),
@@ skipping 11 matching lines @@
 
 int NavigationEntryImpl::GetUniqueID() const {
   return unique_id_;
 }
 
 PageType NavigationEntryImpl::GetPageType() const {
   return page_type_;
 }
 
 void NavigationEntryImpl::SetURL(const GURL& url) {
-  frame_entry_.set_url(url);
+  frame_tree_->frame_entry->set_url(url);
   cached_display_title_.clear();
 }
 
 const GURL& NavigationEntryImpl::GetURL() const {
-  return frame_entry_.url();
+  return frame_tree_->frame_entry->url();
 }
 
 void NavigationEntryImpl::SetBaseURLForDataURL(const GURL& url) {
   base_url_for_data_url_ = url;
 }
 
 const GURL& NavigationEntryImpl::GetBaseURLForDataURL() const {
   return base_url_for_data_url_;
 }
 
 void NavigationEntryImpl::SetReferrer(const Referrer& referrer) {
-  frame_entry_.set_referrer(referrer);
+  frame_tree_->frame_entry->set_referrer(referrer);
 }
 
 const Referrer& NavigationEntryImpl::GetReferrer() const {
-  return frame_entry_.referrer();
+  return frame_tree_->frame_entry->referrer();
 }
 
 void NavigationEntryImpl::SetVirtualURL(const GURL& url) {
   virtual_url_ = (url == GetURL()) ? GURL() : url;
   cached_display_title_.clear();
 }
 
 const GURL& NavigationEntryImpl::GetVirtualURL() const {
   return virtual_url_.is_empty() ? GetURL() : virtual_url_;
 }
@@ skipping 17 matching lines @@
 
 void NavigationEntryImpl::SetPageID(int page_id) {
   page_id_ = page_id;
 }
 
 int32 NavigationEntryImpl::GetPageID() const {
   return page_id_;
 }
 
 void NavigationEntryImpl::set_site_instance(SiteInstanceImpl* site_instance) {
-  frame_entry_.set_site_instance(site_instance);
+  // TODO(creis): Update all callers and remove this method.
+  frame_tree_->frame_entry->set_site_instance(site_instance);
 }
 
 void NavigationEntryImpl::set_source_site_instance(
     SiteInstanceImpl* source_site_instance) {
   source_site_instance_ = source_site_instance;
 }
 
 void NavigationEntryImpl::SetBindings(int bindings) {
   // Ensure this is set to a valid value, and that it stays the same once set.
   CHECK_NE(bindings, kInvalidBindings);
@@ skipping 168 matching lines @@
   return true;
 }
 
 void NavigationEntryImpl::ClearExtraData(const std::string& key) {
   extra_data_.erase(key);
 }
 
 NavigationEntryImpl* NavigationEntryImpl::Clone() const {
   NavigationEntryImpl* copy = new NavigationEntryImpl();
 
-  // TODO(creis): Once we have a tree of FrameNavigationEntries, make a deep
-  // copy.  Only share the same FrameNavigationEntries if cloning within the
-  // same tab.
-  copy->frame_entry_ = frame_entry_;
+  // TODO(creis): Only share the same FrameNavigationEntries if cloning within
+  // the same tab.
+  copy->frame_tree_.reset(frame_tree_->Clone());
 
   // Copy all state over, unless cleared in ResetForCommit.
   copy->unique_id_ = unique_id_;
   copy->bindings_ = bindings_;
   copy->page_type_ = page_type_;
   copy->virtual_url_ = virtual_url_;
   copy->update_virtual_url_with_url_ = update_virtual_url_with_url_;
   copy->title_ = title_;
   copy->favicon_ = favicon_;
   copy->page_state_ = page_state_;
@@ skipping 119 matching lines @@
             GetBrowserInitiatedPostData()->size());
   }
 
   return StartNavigationParams(
       GetHasPostData(), extra_headers(), browser_initiated_post_data,
       should_replace_entry(), transferred_global_request_id().child_id,
       transferred_global_request_id().request_id);
 }
 
 }  // namespace content