Unify frame IDs with RenderFrameHost routing IDs.

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"
@@ skipping 13 matching lines @@
                         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;
 }
 
-// TODO(creis): Remove this version along with FrameTreeNode::frame_id().
-bool FrameTreeNodeForFrameId(int64 frame_id,
-                             FrameTreeNode** out_node,
-                             FrameTreeNode* node) {
-  if (node->frame_id() == frame_id) {
+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;
     // Terminate iteration once the node has been found.
     return false;
   }
   return true;
 }
 
 // Iterate over the FrameTree to reset any node affected by the loss of the
 // given RenderViewHost's process.
 bool ResetNodesForNewProcess(RenderViewHost* render_view_host,
@@ skipping 13 matching lines @@
     : render_frame_delegate_(render_frame_delegate),
       render_view_delegate_(render_view_delegate),
       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,
-                              FrameTreeNode::kInvalidFrameId,
                               std::string())) {
 }
 
 FrameTree::~FrameTree() {
 }
 
 FrameTreeNode* FrameTree::FindByID(int64 frame_tree_node_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node));
   return node;
 }
 
+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(
     const base::Callback<bool(FrameTreeNode*)>& on_node) const {
   std::queue<FrameTreeNode*> queue;
   queue.push(root_.get());
 
   while (!queue.empty()) {
     FrameTreeNode* node = queue.front();
     queue.pop();
     if (!on_node.Run(node))
       break;
 
     for (size_t i = 0; i < node->child_count(); ++i)
       queue.push(node->child_at(i));
   }
 }
 
-bool FrameTree::IsFirstNavigationAfterSwap() const {
-  return root_->frame_id() == FrameTreeNode::kInvalidFrameId;
-}
-
-void FrameTree::OnFirstNavigationAfterSwap(int main_frame_id) {
-  root_->set_frame_id(main_frame_id);
-}
-
-RenderFrameHostImpl* FrameTree::AddFrame(int frame_routing_id,
-                                         int64 parent_frame_id,
-                                         int64 frame_id,
+RenderFrameHostImpl* FrameTree::AddFrame(FrameTreeNode* parent,
+                                         int new_routing_id,
                                          const std::string& frame_name) {
-  FrameTreeNode* parent = FindByFrameID(parent_frame_id);
-  // TODO(ajwong): Should the renderer be killed here? Would there be a race on
-  // shutdown that might make this case possible?
-  if (!parent)
-    return NULL;
-
   scoped_ptr<FrameTreeNode> node(new FrameTreeNode(
       this, parent->navigator(), render_frame_delegate_, render_view_delegate_,
-      render_widget_delegate_, manager_delegate_, frame_id, frame_name));
+      render_widget_delegate_, manager_delegate_, frame_name));
   FrameTreeNode* node_ptr = node.get();
   // AddChild is what creates the RenderFrameHost.
-  parent->AddChild(node.Pass(), frame_routing_id);
+  parent->AddChild(node.Pass(), new_routing_id);
   return node_ptr->current_frame_host();
 }
 
-void FrameTree::RemoveFrame(RenderFrameHostImpl* render_frame_host,
-                            int64 parent_frame_id,
-                            int64 frame_id) {
-  // If switches::kSitePerProcess is not specified, then the FrameTree only
-  // contains a node for the root element. However, even in this case
-  // frame detachments need to be broadcast outwards.
-  //
-  // TODO(ajwong): Move this below the |parent| check after the FrameTree is
-  // guaranteed to be correctly populated even without the
-  // switches::kSitePerProcess flag.
-  FrameTreeNode* parent = FindByFrameID(parent_frame_id);
-  FrameTreeNode* child = FindByFrameID(frame_id);
+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->render_view_host(), frame_id);
+        render_frame_host->render_view_host(),
+        render_frame_host->GetRoutingID());
   }
 
-  // TODO(ajwong): Should the renderer be killed here? Would there be a race on
-  // shutdown that might make this case possible?
-  if (!parent || !child)
-    return;
-
   parent->RemoveChild(child);
 }
 
-void FrameTree::SetFrameUrl(int64 frame_id, const GURL& url) {
-  FrameTreeNode* node = FindByFrameID(frame_id);
-  // TODO(ajwong): Should the renderer be killed here? Would there be a race on
-  // shutdown that might make this case possible?
-  if (!node)
-    return;
-
-  if (node)
-    node->set_current_url(url);
-}
-
 void FrameTree::ResetForMainFrameSwap() {
   root_->ResetForNewProcess();
 }
 
 void FrameTree::RenderProcessGone(RenderViewHost* render_view_host) {
   // Walk the full tree looking for nodes that may be affected.  Once a frame
   // crashes, all of its child FrameTreeNodes go away.
   // Note that the helper function may call ResetForNewProcess on a node, which
   // clears its children before we iterate over them.  That's ok, because
   // ForEach does not add a node's children to the queue until after visiting
   // the node itself.
   ForEach(base::Bind(&ResetNodesForNewProcess, render_view_host));
 }
 
 RenderFrameHostImpl* FrameTree::GetMainFrame() const {
   return root_->current_frame_host();
 }
 
 void FrameTree::SetFrameRemoveListener(
-    const base::Callback<void(RenderViewHostImpl*, int64)>& on_frame_removed) {
+    const base::Callback<void(RenderViewHostImpl*, int)>& on_frame_removed) {
   on_frame_removed_ = on_frame_removed;
 }
 
-void FrameTree::ClearFrameRemoveListenerForTesting() {
-  on_frame_removed_.Reset();
-}
-
 RenderViewHostImpl* FrameTree::CreateRenderViewHostForMainFrame(
     SiteInstance* site_instance,
     int routing_id,
     int main_frame_routing_id,
     bool swapped_out,
     bool hidden) {
   DCHECK(main_frame_routing_id != MSG_ROUTING_NONE);
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
   if (iter != render_view_host_map_.end()) {
@@ skipping 79 matching lines @@
       if (rvh->ref_count() == 0) {
         rvh->Shutdown();
         render_view_host_pending_shutdown_map_.erase(multi_iter);
       }
       break;
     }
     CHECK(render_view_host_found);
   }
 }
 
-FrameTreeNode* FrameTree::FindByFrameID(int64 frame_id) {
-  FrameTreeNode* node = NULL;
-  ForEach(base::Bind(&FrameTreeNodeForFrameId, frame_id, &node));
-  return node;
-}
-
 }  // namespace content