diff options
| author | clamy <clamy@chromium.org> | 2015-03-05 09:40:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-05 17:40:47 +0000 |
| commit | cbe86a0c3963fa295521e10f94367e5a45378fd5 (patch) | |
| tree | 180b151f1086b3f46d5e70154b216fc49fd0edf4 /content/browser/frame_host/navigation_request.h | |
| parent | e52ebffface82559ec1943c5e431661e0873cc7c (diff) | |
| download | chromium_src-cbe86a0c3963fa295521e10f94367e5a45378fd5.zip chromium_src-cbe86a0c3963fa295521e10f94367e5a45378fd5.tar.gz chromium_src-cbe86a0c3963fa295521e10f94367e5a45378fd5.tar.bz2 | |
PlzNavigate: send history params at commit time to the renderer
This CL introduces a new struct HistoryNavigationParams used in
FrameMsg_Navigate and FrameMsg_CommitNavigation. This allows to check for stale
backforward navigations when browser-side navigation is enabled.
BUG=376091
TBR=nasko@chromium.org
Review URL: https://codereview.chromium.org/979443002
Cr-Commit-Position: refs/heads/master@{#319276}
Diffstat (limited to 'content/browser/frame_host/navigation_request.h')
| -rw-r--r-- | content/browser/frame_host/navigation_request.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h index 56e993d..a7a760a 100644 --- a/content/browser/frame_host/navigation_request.h +++ b/content/browser/frame_host/navigation_request.h @@ -61,7 +61,8 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate { FrameTreeNode* frame_tree_node, const NavigationEntryImpl& entry, FrameMsg_Navigate_Type::Value navigation_type, - base::TimeTicks navigation_start); + base::TimeTicks navigation_start, + const HistoryNavigationParams& history_params); // Creates a request for a renderer-intiated navigation. // Note: |body| is sent to the IO thread when calling BeginNavigation, and @@ -70,7 +71,9 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate { FrameTreeNode* frame_tree_node, const CommonNavigationParams& common_params, const BeginNavigationParams& begin_params, - scoped_refptr<ResourceRequestBody> body); + scoped_refptr<ResourceRequestBody> body, + int current_history_list_offset, + int current_history_list_length); ~NavigationRequest() override; @@ -86,6 +89,10 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate { const CommitNavigationParams& commit_params() const { return commit_params_; } + const HistoryNavigationParams& history_params() const { + return history_params_; + } + NavigationURLLoader* loader_for_testing() const { return loader_.get(); } NavigationState state() const { return state_; } @@ -118,6 +125,7 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate { const CommonNavigationParams& common_params, const BeginNavigationParams& begin_params, const CommitNavigationParams& commit_params, + const HistoryNavigationParams& history_params, scoped_refptr<ResourceRequestBody> body, bool browser_initiated, const NavigationEntryImpl* navitation_entry); @@ -141,6 +149,7 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate { CommonNavigationParams common_params_; const BeginNavigationParams begin_params_; const CommitNavigationParams commit_params_; + const HistoryNavigationParams history_params_; const bool browser_initiated_; NavigationState state_; |