Unify frame IDs with RenderFrameHost routing IDs.

content/browser/frame_host/frame_tree_node.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 class FrameTree;
 class Navigator;
 class RenderFrameHostImpl;
 
 // When a page contains iframes, its renderer process maintains a tree structure
 // of those frames. We are mirroring this tree in the browser process. This
 // class represents a node in this tree and is a wrapper for all objects that
 // are frame-specific (as opposed to page-specific).
 class CONTENT_EXPORT FrameTreeNode {
  public:
-  static const int64 kInvalidFrameId;
 
   FrameTreeNode(FrameTree* frame_tree,
                 Navigator* navigator,
                 RenderFrameHostDelegate* render_frame_delegate,
                 RenderViewHostDelegate* render_view_delegate,
                 RenderWidgetHostDelegate* render_widget_delegate,
                 RenderFrameHostManager::Delegate* manager_delegate,
-                int64 frame_id,
                 const std::string& name);
 
   ~FrameTreeNode();
 
   bool IsMainFrame() const;
 
   void AddChild(scoped_ptr<FrameTreeNode> child, int frame_routing_id);
   void RemoveChild(FrameTreeNode* child);
 
   // Clears process specific-state in this node to prepare for a new process.
   void ResetForNewProcess();
 
   FrameTree* frame_tree() const {
     return frame_tree_;
   }
 
   Navigator* navigator() {
     return navigator_.get();
   }
 
   RenderFrameHostManager* render_manager() {
     return &render_manager_;
   }
 
   int64 frame_tree_node_id() const {
     return frame_tree_node_id_;
   }
 
-  // DO NOT USE.  Only used by FrameTree until we replace renderer-specific
-  // frame IDs with RenderFrameHost routing IDs.
-  void set_frame_id(int64 frame_id) {
-    DCHECK_EQ(frame_id_, kInvalidFrameId);
-    frame_id_ = frame_id;
-  }
-  int64 frame_id() const {
-    return frame_id_;
-  }
-
   const std::string& frame_name() const {
     return frame_name_;
   }
 
   size_t child_count() const {
     return children_.size();
   }
 
   FrameTreeNode* parent() const { return parent_; }
 
@@ skipping 29 matching lines @@
   // Manages creation and swapping of RenderFrameHosts for this frame.  This
   // must be declared before |children_| so that it gets deleted after them.
   //  That's currently necessary so that RenderFrameHostImpl's destructor can
   // call GetProcess.
   RenderFrameHostManager render_manager_;
 
   // A browser-global identifier for the frame in the page, which stays stable
   // even if the frame does a cross-process navigation.
   const int64 frame_tree_node_id_;
 
-  // The renderer-specific identifier for the frame in the page.
-  // TODO(creis): Remove this in favor of the RenderFrameHost's routing ID once
-  // we create FrameTreeNodes for all frames (even without a flag), since this
-  // value can change after cross-process navigations.
-  int64 frame_id_;
-
   // The assigned name of the frame. This name can be empty, unlike the unique
   // name generated internally in the DOM tree.
   std::string frame_name_;
 
   // The parent node of this frame. NULL if this node is the root or if it has
   // not yet been attached to the frame tree.
   FrameTreeNode* parent_;
 
   // The immediate children of this specific frame.
   ScopedVector<FrameTreeNode> children_;
 
   // Track the current frame's last committed URL, so we can estimate the
   // process impact of out-of-process iframes.
   // TODO(creis): Remove this when we can store subframe URLs in the
   // NavigationController.
   GURL current_url_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_