Clone the subframe FrameNavigationEntries for in-page 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 29 matching lines @@
     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;
 }
 
 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));
-  }
+    FrameNavigationEntry* frame_navigation_entry,
+    bool clone_children_of_target) const {
+  bool is_target = frame_tree_node && MatchesFrame(frame_tree_node);
 
-  // Clone the tree using a copy of the FrameNavigationEntry, without sharing.
+  // Clone the tree using either the target entry or a copy of the current
+  // FrameNavigationEntry, without sharing.
   // TODO(creis): Share FNEs unless it's for another tab.
   scoped_ptr<NavigationEntryImpl::TreeNode> copy(
-      new NavigationEntryImpl::TreeNode(frame_entry->Clone()));
+      new NavigationEntryImpl::TreeNode(is_target ? frame_navigation_entry :
+                                                    frame_entry->Clone()));
 
-  // Recursively clone the children.
-  for (auto& child : children) {
-    copy->children.push_back(
-        child->CloneAndReplace(frame_tree_node, frame_navigation_entry));
+  // Recursively clone the children if this wasn't the target or if we were told
+  // to clone the target's children.
+  if (!is_target || clone_children_of_target) {
+    for (auto& child : children) {
+      copy->children.push_back(
+          child->CloneAndReplace(frame_tree_node, frame_navigation_entry,
+                                 clone_children_of_target));
+    }
   }
 
   return copy.Pass();
 }
 
 scoped_ptr<NavigationEntry> NavigationEntry::Create() {
   return make_scoped_ptr(new NavigationEntryImpl()).Pass();
 }
 
 NavigationEntryImpl* NavigationEntryImpl::FromNavigationEntry(
@@ skipping 303 matching lines @@
     return false;
   *data = iter->second;
   return true;
 }
 
 void NavigationEntryImpl::ClearExtraData(const std::string& key) {
   extra_data_.erase(key);
 }
 
 scoped_ptr<NavigationEntryImpl> NavigationEntryImpl::Clone() const {
-  return NavigationEntryImpl::CloneAndReplace(nullptr, nullptr);
+  return NavigationEntryImpl::CloneAndReplace(nullptr, nullptr, true);
 }
 
 scoped_ptr<NavigationEntryImpl> NavigationEntryImpl::CloneAndReplace(
     FrameTreeNode* frame_tree_node,
-    FrameNavigationEntry* frame_navigation_entry) const {
+    FrameNavigationEntry* frame_navigation_entry,
+    bool clone_children_of_target) const {
   scoped_ptr<NavigationEntryImpl> copy =
       make_scoped_ptr(new NavigationEntryImpl());
 
   // TODO(creis): Only share the same FrameNavigationEntries if cloning within
   // the same tab.
   copy->frame_tree_ =
-      frame_tree_->CloneAndReplace(frame_tree_node, frame_navigation_entry);
+      frame_tree_->CloneAndReplace(frame_tree_node, frame_navigation_entry,
+                                   clone_children_of_target);
 
   // 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 196 matching lines @@
       return node;
     }
     // Enqueue any children and keep looking.
     for (auto& child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content