Remove WebHistoryItem child usage

content/renderer/history_entry.cc

 // Copyright 2014 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 17 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "content/renderer/history_entry.h"
 
-#include <deque>
-
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
 using blink::WebFrame;
 using blink::WebHistoryItem;
 
 namespace content {
 
 HistoryEntry::HistoryNode* HistoryEntry::HistoryNode::AddChild(
     const WebHistoryItem& item,
     int64_t frame_id) {
   children_->push_back(new HistoryNode(entry_, item, frame_id));
   return children_->back();
 }
 
+HistoryEntry::HistoryNode* HistoryEntry::HistoryNode::AddChild() {
+  return AddChild(WebHistoryItem(), kInvalidFrameRoutingID);
+}
+
 HistoryEntry::HistoryNode* HistoryEntry::HistoryNode::CloneAndReplace(
     HistoryEntry* new_entry,
     const WebHistoryItem& new_item,
     bool clone_children_of_target,
     RenderFrameImpl* target_frame,
     RenderFrameImpl* current_frame) {
   bool is_target_frame = target_frame == current_frame;
   const WebHistoryItem& item_for_create = is_target_frame ? new_item : item_;
   HistoryNode* new_history_node = new HistoryNode(
       new_entry, item_for_create, current_frame->GetRoutingID());
@@ skipping 17 matching lines @@
                                               new_item,
                                               clone_children_of_target,
                                               target_frame,
                                               child_render_frame);
       new_history_node->children_->push_back(new_child_node);
     }
   }
   return new_history_node;
 }
 
+void HistoryEntry::HistoryNode::set_item(const WebHistoryItem& item) {
+  // The previous HistoryItem might not have ahad a target set, or it might be

[Charlie Reis, 2014/04/29 00:24:37]

nit: ahad -> had

[Nate Chapin, 2014/04/29 19:31:53]

Done.

+  // different than the current one.
+  entry_->unique_names_to_items_[item.target().utf8()] = this;
+  item_ = item;
+}
+
 HistoryEntry::HistoryNode::HistoryNode(HistoryEntry* entry,
                                        const WebHistoryItem& item,
                                        int64_t frame_id)
     : entry_(entry), item_(item) {
   if (frame_id != kInvalidFrameRoutingID)
     entry_->frames_to_items_[frame_id] = this;
-  entry_->unique_names_to_items_[item.target().utf8()] = this;
+  if (!item.isNull())
+    entry_->unique_names_to_items_[item.target().utf8()] = this;
   children_.reset(new ScopedVector<HistoryNode>);
 }
 
 HistoryEntry::HistoryNode::~HistoryNode() {
 }
 
 void HistoryEntry::HistoryNode::RemoveChildren() {
   // TODO(japhet): This is inefficient. Figure out a cleaner way to ensure
   // this HistoryNode isn't cached anywhere.
   std::vector<uint64_t> frames_to_remove;
@@ skipping 21 matching lines @@
     }
   }
   for (unsigned i = 0; i < frames_to_remove.size(); i++)
     entry_->frames_to_items_.erase(frames_to_remove[i]);
   for (unsigned i = 0; i < unique_names_to_remove.size(); i++)
     entry_->unique_names_to_items_.erase(unique_names_to_remove[i]);
   children_.reset(new ScopedVector<HistoryNode>);
 }
 
 HistoryEntry::HistoryEntry() {
+  root_.reset(new HistoryNode(this, WebHistoryItem(), kInvalidFrameRoutingID));
 }
 
 HistoryEntry::~HistoryEntry() {
 }
 
 HistoryEntry::HistoryEntry(const WebHistoryItem& root, int64_t frame_id) {
   root_.reset(new HistoryNode(this, root, frame_id));
 }
 
 HistoryEntry* HistoryEntry::CloneAndReplace(const WebHistoryItem& new_item,
@@ skipping 17 matching lines @@
   return unique_names_to_items_[frame->GetWebFrame()->uniqueName().utf8()];
 }
 
 WebHistoryItem HistoryEntry::GetItemForFrame(RenderFrameImpl* frame) {
   if (HistoryNode* history_node = GetHistoryNodeForFrame(frame))
     return history_node->item();
   return WebHistoryItem();
 }
 
 }  // namespace content