Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(509)

Unified Diff: content/browser/frame_host/frame_tree_node.h

Issue 1080073004: PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed compilation error Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_node.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_tree_node.h
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h
index 30843d8f2723c8663f30370e980322f67fa3724d..e321d3a51b9923656f747c969bed0dd38ba12f7f 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -21,6 +21,7 @@
namespace content {
class FrameTree;
+class NavigationRequest;
class Navigator;
class RenderFrameHostImpl;
@@ -142,6 +143,20 @@ class CONTENT_EXPORT FrameTreeNode {
// 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
+ // Resets 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; }
@@ -195,6 +210,11 @@ class CONTENT_EXPORT FrameTreeNode {
// 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 a RenderFrameHost will be responsible for the navigation.
+ scoped_ptr<NavigationRequest> navigation_request_;
+
DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
};
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698