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/navigation_request.h"

[Fabrice (no longer in Chrome), 2015/04/15 12:44:50]

nit: I think we can forward-declare here.
We are also including render_frame_host_impl.h and forward-declaring
RenderFrameHostImpl when it does not seem necessary.

[clamy, 2015/04/16 12:12:30]

Done.

 #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 111 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
+  // 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 a navigation happening in this node until it is ready to commit (it

[nasko, 2015/04/15 20:36:04]

nit: s/a navigation happening/ongoing NavigationRequest/

[clamy, 2015/04/16 12:12:30]

Done.

+  // will then be owned by the current RenderFrameHost).

[nasko, 2015/04/15 20:36:04]

nit: It might not be the current RFH, but the speculative or a new one. I'm not
sure what a better wording of it is, so probably use "the RenderFrameHost"
without specifying which one.

[clamy, 2015/04/16 12:12:30]

Done. I've also modified the comment to clarify the lifetime of the
NavigationRequest.

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