DRAFT CL: Add FrameNavigationEntry and track subframe session histories.

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"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/frame_host/render_frame_host_manager.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_replication_state.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace content {
 
 class FrameTree;
@@ skipping 53 matching lines @@
   size_t child_count() const {
     return children_.size();
   }
 
   FrameTreeNode* parent() const { return parent_; }
 
   FrameTreeNode* child_at(size_t index) const {
     return children_[index];
   }
 
-  const GURL& current_url() const {
-    return current_url_;
+  FrameNavigationEntry* last_committed_frame_entry() {
+    return last_committed_frame_entry_.get();
   }
 
-  void set_current_url(const GURL& url) {
-    current_url_ = url;
+  void set_last_committed_frame_entry(FrameNavigationEntry* entry) {
+    last_committed_frame_entry_ = entry;
+  }
+
+  // TODO(creis): Rename to last_committed_url().
+  const GURL& current_url() const {
+    if (last_committed_frame_entry_)
+      return last_committed_frame_entry_->url();
+    return GURL::EmptyGURL();
   }
 
   void set_current_origin(const url::Origin& origin) {
     replication_state_.origin = origin;
   }
 
   void SetFrameName(const std::string& name);
 
   SandboxFlags effective_sandbox_flags() { return effective_sandbox_flags_; }
 
@@ skipping 48 matching lines @@
   // even if the frame does a cross-process navigation.
   const int64 frame_tree_node_id_;
 
   // 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_;
+  // Track the current frame's last committed FrameNavigationEntry, which lets
+  // other callers know what the last committed URL is.
+  scoped_refptr<FrameNavigationEntry> last_committed_frame_entry_;
 
   // Track information that needs to be replicated to processes that have
   // proxies for this frame.
   FrameReplicationState replication_state_;
 
   // Track the effective sandbox flags for this frame.  When a parent frame
   // dynamically updates sandbox flags for a child frame, the child's updated
   // sandbox flags are stored in replication_state_.sandbox_flags. However, the
   // update only takes effect on the next frame navigation, so the effective
   // sandbox flags are tracked separately here.  When enforcing sandbox flags
   // directives in the browser process, |effective_sandbox_flags_| should be
   // used.  |effective_sandbox_flags_| is updated with any pending sandbox
   // flags when a navigation for this frame commits.
   SandboxFlags effective_sandbox_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_