PlzNavigate: send history params at commit time to the renderer

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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.
 
 #include "content/browser/frame_host/navigation_request.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/frame_host/navigator.h"
@@ skipping 43 matching lines @@
   // Data urls should not make network requests.
   // TODO(clamy): same document navigations should not make network requests.
   return !url.SchemeIs(url::kDataScheme);
 }
 
 // static
 scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
     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) {
   std::string method = entry.GetHasPostData() ? "POST" : "GET";
 
   // Copy existing headers and add necessary headers that may not be present
   // in the RequestNavigationParams.
   net::HttpRequestHeaders headers;
   headers.AddHeadersFromString(entry.extra_headers());
   headers.SetHeaderIfMissing(net::HttpRequestHeaders::kUserAgent,
                              GetContentClient()->GetUserAgent());
   // TODO(clamy): match what blink is doing with accept headers.
   headers.SetHeaderIfMissing("Accept", "*/*");
@@ skipping 12 matching lines @@
       FrameMsg_UILoadMetricsReportType::NO_REPORT;
   base::TimeTicks ui_timestamp = base::TimeTicks();
 #if defined(OS_ANDROID)
   if (!entry.intent_received_timestamp().is_null())
     report_type = FrameMsg_UILoadMetricsReportType::REPORT_INTENT;
   ui_timestamp = entry.intent_received_timestamp();
 #endif
 
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
       frame_tree_node,
-      CommonNavigationParams(entry.GetURL(), entry.GetReferrer(),
-                             entry.GetTransitionType(), navigation_type,
-                             !entry.IsViewSourceMode(),ui_timestamp,
-                             report_type, entry.GetBaseURLForDataURL(),
-                             entry.GetHistoryURLForDataURL()),
+      CommonNavigationParams(
+          entry.GetURL(), entry.GetReferrer(), entry.GetTransitionType(),
+          navigation_type, !entry.IsViewSourceMode(), ui_timestamp, report_type,
+          entry.GetBaseURLForDataURL(), entry.GetHistoryURLForDataURL()),
       BeginNavigationParams(method, headers.ToString(),
-                            LoadFlagFromNavigationType(navigation_type),
-                            false),
-      CommitNavigationParams(entry.GetPageState(),
-                             entry.GetIsOverridingUserAgent(),
+                            LoadFlagFromNavigationType(navigation_type), false),
+      CommitNavigationParams(entry.GetIsOverridingUserAgent(),
                              navigation_start),
-      request_body, true, &entry));
+      history_params, request_body, true, &entry));
   return navigation_request.Pass();
 }
 
 // static
 scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
     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) {
   // TODO(clamy): Check if some PageState should be provided here.
   // TODO(clamy): See how we should handle override of the user agent when the
   // navigation may start in a renderer and commit in another one.
   // TODO(clamy): See if the navigation start time should be measured in the
   // renderer and sent to the browser instead of being measured here.
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
       frame_tree_node, common_params, begin_params,
-      CommitNavigationParams(PageState(), false, base::TimeTicks::Now()),
+      CommitNavigationParams(false, base::TimeTicks::Now()),
+      HistoryNavigationParams(PageState(), -1, -1, current_history_list_offset,
+                              current_history_list_length, false),
       body, false, nullptr));
   return navigation_request.Pass();
 }
 
 NavigationRequest::NavigationRequest(
     FrameTreeNode* frame_tree_node,
     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* entry)
     : frame_tree_node_(frame_tree_node),
       common_params_(common_params),
       begin_params_(begin_params),
       commit_params_(commit_params),
+      history_params_(history_params),
       browser_initiated_(browser_initiated),
       state_(NOT_STARTED),
       restore_type_(NavigationEntryImpl::RESTORE_NONE),
       is_view_source_(false),
       bindings_(NavigationEntryImpl::kInvalidBindings) {
   if (entry) {
     source_site_instance_ = entry->source_site_instance();
     dest_site_instance_ = entry->site_instance();
     restore_type_ = entry->restore_type();
     is_view_source_ = entry->IsViewSourceMode();
@@ skipping 64 matching lines @@
   // TODO(davidben): Network failures should display a network error page.
   NOTIMPLEMENTED() << " where net_error=" << net_error;
 }
 
 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
   frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
                                                         common_params_.url);
 }
 
 }  // namespace content