PlzNavigate: Add a static CommitNavigation method in FrameTreeNode

content/browser/frame_host/frame_tree.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.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/containers/hash_tables.h"
+#include "base/lazy_instance.h"
 #include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/frame_host/navigation_before_commit_info.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_factory.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/public/browser/browser_thread.h"
 
 namespace content {
 
 namespace {
-// Used with FrameTree::ForEach() to search for the FrameTreeNode
-// corresponding to |frame_tree_node_id|.
-bool FrameTreeNodeForId(int64 frame_tree_node_id,
-                        FrameTreeNode** out_node,
-                        FrameTreeNode* node) {
-  if (node->frame_tree_node_id() == frame_tree_node_id) {
-    *out_node = node;
-    // Terminate iteration once the node has been found.
-    return false;
-  }
-  return true;
+
+// This is a global map between frame_tree_node_ids and pointer to
+// FrameTreeNodes.
+typedef base::hash_map<int64, FrameTreeNode*> FrameTreeNodeIDMap;
+
+base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map =
+    LAZY_INSTANCE_INITIALIZER;
+
+// Used by static methods to return a pointer to FrameTreeNode from the global
+// |frame_tree_node_id|.
+FrameTreeNode* FrameTreeNodeForGlobalId(int64 frame_tree_node_id) {

[nasko, 2014/08/13 00:52:53]

nit: The FTN id is global in all cases, so we can drop the "Global" part of the
name.

+  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;
 }
 
 bool FrameTreeNodeForRoutingId(int routing_id,
                                int process_id,
                                FrameTreeNode** out_node,
                                FrameTreeNode* node) {
   // TODO(creis): Look through the swapped out RFHs as well.
   if (node->current_frame_host()->GetProcess()->GetID() == process_id &&
       node->current_frame_host()->GetRoutingID() == routing_id) {
     *out_node = node;
@@ skipping 35 matching lines @@
       render_widget_delegate_(render_widget_delegate),
       manager_delegate_(manager_delegate),
       root_(new FrameTreeNode(this,
                               navigator,
                               render_frame_delegate,
                               render_view_delegate,
                               render_widget_delegate,
                               manager_delegate,
                               std::string())),
       focused_frame_tree_node_id_(-1) {
+  g_frame_tree_node_id_map.Get().insert(
+      std::make_pair(root_->frame_tree_node_id(), root_.get()));

[nasko, 2014/08/13 00:52:53]

Let's check here that we never insert duplicate entries. RF(H) uses that pattern
already.

 }
 
 FrameTree::~FrameTree() {
+  g_frame_tree_node_id_map.Get().erase(root_->frame_tree_node_id());
+}
+
+// static
+void FrameTree::CommitNavigationInNode(int64 frame_tree_node_id,
+                                       const NavigationBeforeCommitInfo& info) {
+  FrameTreeNode* node = FrameTreeNodeForGlobalId(frame_tree_node_id);
+  if (!node)
+    return;
+  DCHECK(node->frame_tree_node_id() == frame_tree_node_id);
+  node->render_manager()->CommitNavigation(info);
 }
 
 FrameTreeNode* FrameTree::FindByID(int64 frame_tree_node_id) {
-  FrameTreeNode* node = NULL;
-  ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node));
-  return node;
+  return FrameTreeNodeForGlobalId(frame_tree_node_id);
 }
 
 FrameTreeNode* FrameTree::FindByRoutingID(int routing_id, int process_id) {
   FrameTreeNode* node = NULL;
   ForEach(
       base::Bind(&FrameTreeNodeForRoutingId, routing_id, process_id, &node));
   return node;
 }
 
 void FrameTree::ForEach(
@@ skipping 11 matching lines @@
       queue.push(node->child_at(i));
   }
 }
 
 RenderFrameHostImpl* FrameTree::AddFrame(FrameTreeNode* parent,
                                          int new_routing_id,
                                          const std::string& frame_name) {
   scoped_ptr<FrameTreeNode> node(new FrameTreeNode(
       this, parent->navigator(), render_frame_delegate_, render_view_delegate_,
       render_widget_delegate_, manager_delegate_, frame_name));
+  g_frame_tree_node_id_map.Get().insert(
+      std::make_pair(node->frame_tree_node_id(), node.get()));
   FrameTreeNode* node_ptr = node.get();
   // AddChild is what creates the RenderFrameHost.
   parent->AddChild(node.Pass(), new_routing_id);
   return node_ptr->current_frame_host();
 }
 
 void FrameTree::RemoveFrame(FrameTreeNode* child) {
   FrameTreeNode* parent = child->parent();
   if (!parent) {
     NOTREACHED() << "Unexpected RemoveFrame call for main frame.";
     return;
   }
 
   // Notify observers of the frame removal.
   RenderFrameHostImpl* render_frame_host = child->current_frame_host();
   if (!on_frame_removed_.is_null()) {
     on_frame_removed_.Run(render_frame_host);
   }
-
+  g_frame_tree_node_id_map.Get().erase(child->frame_tree_node_id());
   parent->RemoveChild(child);
 }
 
 void FrameTree::CreateProxiesForSiteInstance(
     FrameTreeNode* source,
     SiteInstance* site_instance) {
   // Create the swapped out RVH for the new SiteInstance. This will create
   // a top-level swapped out RFH as well, which will then be wrapped by a
   // RenderFrameProxyHost.
   if (!source->IsMainFrame()) {
@@ skipping 138 matching lines @@
         rvh->Shutdown();
         render_view_host_pending_shutdown_map_.erase(multi_iter);
       }
       break;
     }
     CHECK(render_view_host_found);
   }
 }
 
 }  // namespace content