PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode

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/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;
+class NavigationRequest;
 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:
   // These values indicate the loading progress status. The minimum progress
@@ skipping 101 matching lines @@
   bool IsLoading() const;
 
   // Sets this node's loading progress (from 0 to 1).
   void set_loading_progress(double loading_progress) {
     loading_progress_ = loading_progress;
   }
 
   // Returns this node's loading progress.
   double loading_progress() const { return loading_progress_; }
 
+  NavigationRequest* navigation_request() { return navigation_request_.get(); }
+
+  // PlzNavigate
+  // Takes ownership of |navigation_request| and makes it the current
+  // NavigationRequest of this frame. This corresponds to the start of a new
+  // navigation. If there was an ongoing navigation request before calling this
+  // function, it is canceled. |navigation_request| should not be null.
+  void SetNavigationRequest(scoped_ptr<NavigationRequest> navigation_request);
+
+  // PlzNavigate
+  // Reset the current navigation request. |is_commit| is true if the reset is

[Fabrice (no longer in Chrome), 2015/04/16 14:01:27]

nit: s/Reset/Resets/

[clamy, 2015/04/16 16:14:05]

Done.

+  // due to the commit of the navigation.
+  void ResetNavigationRequest(bool is_commit);
+
  private:
   void set_parent(FrameTreeNode* parent) { parent_ = parent; }
 
   // The next available browser-global FrameTreeNode ID.
   static int64 next_frame_tree_node_id_;
 
   // The FrameTree that owns us.
   FrameTree* frame_tree_;  // not owned.
 
   // The Navigator object responsible for managing navigations at this node
@@ skipping 33 matching lines @@
   // 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_;
 
   // Used to track this node's loading progress (from 0 to 1).
   double loading_progress_;
 
+  // PlzNavigate
+  // Owns an ongoing NavigationRequest until it is ready to commit. It will then
+  // be reset and the navigation will be owned by a RenderFrameHost.

[nasko, 2015/04/16 16:02:34]

nit: s/navigation/NavigationRequest/. A navigation on its own isn't an object
that anyone owns.

[clamy, 2015/04/16 16:14:05]

I've rephrased it. We cannot use NavigationRequest here, since the
NavigationRequest is destroyed at commit time, and so it is never owned by a
RFH.

+  scoped_ptr<NavigationRequest> navigation_request_;
+
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_