Create FrameNavigationEntries for manual subframe navigations.

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 <queue>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 26 matching lines @@
     FrameTreeNode* frame_tree_node) const {
   if (frame_tree_node->frame_tree_node_id() ==
       frame_entry->frame_tree_node_id())
     return true;
 
   // For now, we set the root FNE's FrameTreeNode ID to -1.
   return frame_tree_node->IsMainFrame() &&
          frame_entry->frame_tree_node_id() == -1;
 }
 
-NavigationEntryImpl::TreeNode* NavigationEntryImpl::TreeNode::Clone() const {
+scoped_ptr<NavigationEntryImpl::TreeNode>
+NavigationEntryImpl::TreeNode::CloneAndReplace(
+    FrameTreeNode* frame_tree_node,
+    FrameNavigationEntry* frame_navigation_entry) const {
+  if (frame_tree_node && MatchesFrame(frame_tree_node)) {
+    // Replace this node in the cloned tree and prune its children.
+    return make_scoped_ptr(
+        new NavigationEntryImpl::TreeNode(frame_navigation_entry));
+  }
+
   // Clone the tree using a copy of the FrameNavigationEntry, without sharing.
-  NavigationEntryImpl::TreeNode* copy =
-      new NavigationEntryImpl::TreeNode(frame_entry->Clone());
+  // TODO(creis): Share FNEs unless it's for another tab.
+  scoped_ptr<NavigationEntryImpl::TreeNode> copy(
+      new NavigationEntryImpl::TreeNode(frame_entry->Clone()));
 
-  // TODO(creis): Clone children once we add them.
-  return copy;
+  // Recursively clone the children.
+  for (auto& child : children) {
+    copy->children.push_back(
+        child->CloneAndReplace(frame_tree_node, frame_navigation_entry));
+  }
+
+  return copy.Pass();
 }
 
 NavigationEntry* NavigationEntry::Create() {
   return new NavigationEntryImpl();
 }
 
 NavigationEntryImpl* NavigationEntryImpl::FromNavigationEntry(
     NavigationEntry* entry) {
   return static_cast<NavigationEntryImpl*>(entry);
 }
@@ skipping 280 matching lines @@
     return false;
   *data = iter->second;
   return true;
 }
 
 void NavigationEntryImpl::ClearExtraData(const std::string& key) {
   extra_data_.erase(key);
 }
 
 NavigationEntryImpl* NavigationEntryImpl::Clone() const {
+  return NavigationEntryImpl::CloneAndReplace(nullptr, nullptr);
+}
+
+NavigationEntryImpl* NavigationEntryImpl::CloneAndReplace(
+    FrameTreeNode* frame_tree_node,
+    FrameNavigationEntry* frame_navigation_entry) const {
   NavigationEntryImpl* copy = new NavigationEntryImpl();
 
   // TODO(creis): Only share the same FrameNavigationEntries if cloning within
   // the same tab.
-  copy->frame_tree_.reset(frame_tree_->Clone());
+  copy->frame_tree_ =
+      frame_tree_->CloneAndReplace(frame_tree_node, frame_navigation_entry);
 
   // Copy most state over, unless cleared in ResetForCommit.
   // Don't copy unique_id_, otherwise it won't be unique.
   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_id_ = page_id_;
@@ skipping 117 matching lines @@
                                                 const GURL& url,
                                                 const Referrer& referrer,
                                                 const PageState& page_state) {
   // We should already have a TreeNode for the parent node by the time this node
   // commits.  Find it first.
   DCHECK(frame_tree_node->parent());
   NavigationEntryImpl::TreeNode* parent_node =
       FindFrameEntry(frame_tree_node->parent());
   if (!parent_node) {
     // The renderer should not send a commit for a subframe before its parent.
-    // TODO(creis): This can currently happen because we don't yet clone the
-    // FrameNavigationEntry tree on manual subframe navigations.  Once that's
-    // added, we should kill the renderer if we get here.
+    // TODO(creis): Kill the renderer if we get here.
+    NOTREACHED() << "Shouldn't see a commit for a subframe before parent.";
     return;
   }
 
   // Now check whether we have a TreeNode for the node itself.
   int frame_tree_node_id = frame_tree_node->frame_tree_node_id();
   for (TreeNode* child : parent_node->children) {
     if (child->frame_entry->frame_tree_node_id() == frame_tree_node_id) {
-      // Update the existing FrameNavigationEntry.
+      // Update the existing FrameNavigationEntry (e.g., for replaceState).
       child->frame_entry->UpdateEntry(site_instance, url, referrer, page_state);
       return;
     }
   }
 
   // No entry exists yet, so create a new one unless it's for about:blank.
   // Unordered list, since we expect to look up entries by frame sequence number
   // or unique name.
   if (url == GURL(url::kAboutBlankURL))
     return;
@@ skipping 34 matching lines @@
       return node;
     }
     // Enqueue any children and keep looking.
     for (auto& child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content