PlzNavigate: Add a static CommitNavigation method in FrameTreeNode

content/browser/frame_host/frame_tree_node.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/frame_tree_node.h"
 
 #include <queue>
 
+#include "base/containers/hash_tables.h"
+#include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/public/browser/browser_thread.h"
 
 namespace content {
 
+namespace {
+typedef base::hash_map<int64, FrameTreeNode*> FrameTreeNodeIDMap;
+
+base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map =
+    LAZY_INSTANCE_INITIALIZER;
+
+FrameTreeNode* FrameTreeNodeFromId(int64 frame_tree_node_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FrameTreeNodeIDMap* nodes = g_frame_tree_node_id_map.Pointer();
+  FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id);
+  return it == nodes->end() ? NULL : it->second;
+}
+
+}  // namespace
+
 int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
 
+// static
+void FrameTreeNode::CommitNavigationInNode(int64 frame_tree_node_id,

[nasko, 2014/07/30 08:36:16]

nit: the "InNode" part of the method is redundant, since this is already invoked
on a FrameTreeNode. It would make sense if it was a method on FrameTree.

This brings up another question. Does this belong to FrameTree or the FTN? I
don't have a strong preference, but it feels a bit awkward to call a method on
FTN without knowing which FTN it is about.

[clamy, 2014/08/12 13:41:47]

Done.

+                                           const NavigationCommitInfo& info) {
+  FrameTreeNode* node = FrameTreeNodeFromId(frame_tree_node_id);
+  if (!node)
+    return;
+  DCHECK(node->frame_tree_node_id() == frame_tree_node_id);
+  node->render_manager()->CommitNavigation(info);
+}
+
 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
                              Navigator* navigator,
                              RenderFrameHostDelegate* render_frame_delegate,
                              RenderViewHostDelegate* render_view_delegate,
                              RenderWidgetHostDelegate* render_widget_delegate,
                              RenderFrameHostManager::Delegate* manager_delegate,
                              const std::string& name)
     : frame_tree_(frame_tree),
       navigator_(navigator),
       render_manager_(this,
                       render_frame_delegate,
                       render_view_delegate,
                       render_widget_delegate,
                       manager_delegate),
       frame_tree_node_id_(next_frame_tree_node_id_++),
       frame_name_(name),
-      parent_(NULL) {}
+      parent_(NULL) {
+  g_frame_tree_node_id_map.Get().insert(
+      std::make_pair(frame_tree_node_id_, this));
+}
 
 FrameTreeNode::~FrameTreeNode() {
+  g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_);
 }
 
 bool FrameTreeNode::IsMainFrame() const {
   return frame_tree_->root() == this;
 }
 
 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child,
                              int frame_routing_id) {
   // Initialize the RenderFrameHost for the new node.  We always create child
   // frames in the same SiteInstance as the current frame, and they can swap to
@@ skipping 29 matching lines @@
   current_url_ = GURL();
 
   // The children may not have been cleared if a cross-process navigation
   // commits before the old process cleans everything up.  Make sure the child
   // nodes get deleted before swapping to a new process.
   ScopedVector<FrameTreeNode> old_children = children_.Pass();
   old_children.clear();  // May notify observers.
 }
 
 }  // namespace content