PlzNavigate: implement CommitNavigation on the browser side

content/browser/frame_host/navigator_impl.cc

 // 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.
 
 #include "content/browser/frame_host/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
@@ skipping 64 matching lines @@
 
 
 NavigatorImpl::NavigatorImpl(
     NavigationControllerImpl* navigation_controller,
     NavigatorDelegate* delegate)
     : controller_(navigation_controller),
       delegate_(delegate) {
 }
 
 // static.
+scoped_ptr<FrameMsg_CommitNavigation_Params>
+NavigatorImpl::MakeCommitNavigationParams(
+    const NavigationEntryImpl& entry,
+    const NavigatorImpl* navigator,
+    NavigationController::ReloadType reload_type) {
+  scoped_ptr<FrameMsg_CommitNavigation_Params> commit_navigation_params(
+      new FrameMsg_CommitNavigation_Params());
+  commit_navigation_params->page_id = entry.GetPageID();
+  navigator->controller_->FillHistoryParametersForNavigationEntry(

[(Do not use) nasko, 2014/08/28 16:39:08]

Do we need navigator for anything else than the controller_? 
It doesn't make much sense to have a static method that takes the pointer of the
same type - just make it a regular method on the class.

[clamy, 2014/09/02 18:25:19]

Done.

+      entry,
+      &commit_navigation_params->pending_history_list_offset,
+      &commit_navigation_params->current_history_list_offset,
+      &commit_navigation_params->current_history_list_length);
+  commit_navigation_params->should_clear_history_list =
+      entry.should_clear_history_list();
+  commit_navigation_params->referrer = entry.GetReferrer();
+  commit_navigation_params->transition = entry.GetTransitionType();
+  commit_navigation_params->page_state = entry.GetPageState();
+  commit_navigation_params->navigation_type = GetNavigationType(
+      navigator->controller_->GetBrowserContext(), entry, reload_type);
+  commit_navigation_params->is_overriding_user_agent =
+      entry.GetIsOverridingUserAgent();
+  return commit_navigation_params.Pass();
+}
+
+// static.
 void NavigatorImpl::MakeNavigateParams(
     const NavigationEntryImpl& entry,
-    const NavigationControllerImpl& controller,
+    const NavigatorImpl* navigator,
     NavigationController::ReloadType reload_type,
     base::TimeTicks navigation_start,
     FrameMsg_Navigate_Params* params) {
   params->page_id = entry.GetPageID();
   params->should_clear_history_list = entry.should_clear_history_list();
   params->should_replace_current_entry = entry.should_replace_entry();
-  if (entry.should_clear_history_list()) {
-    // Set the history list related parameters to the same values a
-    // NavigationController would return before its first navigation. This will
-    // fully clear the RenderView's view of the session history.
-    params->pending_history_list_offset = -1;
-    params->current_history_list_offset = -1;
-    params->current_history_list_length = 0;
-  } else {
-    params->pending_history_list_offset = controller.GetIndexOfEntry(&entry);
-    params->current_history_list_offset =
-        controller.GetLastCommittedEntryIndex();
-    params->current_history_list_length = controller.GetEntryCount();
-  }
   params->url = entry.GetURL();
+  navigator->controller_->FillHistoryParametersForNavigationEntry(
+      entry,
+      &params->pending_history_list_offset,
+      &params->current_history_list_offset,
+      &params->current_history_list_length);
   if (!entry.GetBaseURLForDataURL().is_empty()) {
     params->base_url_for_data_url = entry.GetBaseURLForDataURL();
     params->history_url_for_data_url = entry.GetVirtualURL();
   }
   params->referrer = entry.GetReferrer();
   params->transition = entry.GetTransitionType();
   params->page_state = entry.GetPageState();
-  params->navigation_type =
-      GetNavigationType(controller.GetBrowserContext(), entry, reload_type);
+  params->navigation_type = GetNavigationType(
+      navigator->controller_->GetBrowserContext(), entry, reload_type);
   // This is used by the old performance infrastructure to set up DocumentState
   // associated with the RenderView.
   // TODO(ppi): make it go away.
   params->request_time = base::Time::Now();
   params->extra_headers = entry.extra_headers();
   params->transferred_request_child_id =
       entry.transferred_global_request_id().child_id;
   params->transferred_request_request_id =
       entry.transferred_global_request_id().request_id;
   params->is_overriding_user_agent = entry.GetIsOverridingUserAgent();
@@ skipping 217 matching lines @@
 
   // WebContents uses this to fill LoadNotificationDetails when the load
   // completes, so that PerformanceMonitor that listens to the notification can
   // record the load time. PerformanceMonitor is no longer maintained.
   // TODO(ppi): make this go away.
   current_load_start_ = base::TimeTicks::Now();
 
   // Create the navigation parameters.
   FrameMsg_Navigate_Params navigate_params;
   MakeNavigateParams(
-      entry, *controller_, reload_type, navigation_start, &navigate_params);
+      entry, this, reload_type, navigation_start, &navigate_params);
 
   RenderFrameHostManager* manager =
       render_frame_host->frame_tree_node()->render_manager();
 
   // PlzNavigate: the RenderFrameHosts are no longer asked to navigate. Instead
   // the RenderFrameHostManager handles the navigation requests for that frame
   // node.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation)) {
-    return manager->RequestNavigation(entry, navigate_params);
+    return manager->RequestNavigation(
+        MakeCommitNavigationParams(entry, this, reload_type),
+        navigate_params);
   }
 
   RenderFrameHostImpl* dest_render_frame_host = manager->Navigate(entry);
   if (!dest_render_frame_host)
     return false;  // Unable to create the desired RenderFrameHost.
 
   // Make sure no code called via RFHM::Navigate clears the pending entry.
   CHECK_EQ(controller_->GetPendingEntry(), &entry);
 
   // For security, we should never send non-Web-UI URLs to a Web UI renderer.
@@ skipping 282 matching lines @@
     // Navigations in Web UI pages count as browser-initiated navigations.
     params.is_renderer_initiated = false;
   }
 
   if (delegate_)
     delegate_->RequestOpenURL(render_frame_host, params);
 }
 
 void NavigatorImpl::CommitNavigation(
     RenderFrameHostImpl* render_frame_host,
-    const NavigationBeforeCommitInfo& info) {
+    scoped_ptr<FrameMsg_CommitNavigation_Params> commit_navigation_params) {
   CheckWebUIRendererDoesNotDisplayNormalURL(
-      render_frame_host, info.navigation_url);
-  // TODO(clamy): the render_frame_host should now send a commit IPC to the
-  // renderer.
+      render_frame_host, commit_navigation_params->url);
+  render_frame_host->CommitNavigation(*commit_navigation_params.get());
 }
 
 void NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(
     RenderFrameHostImpl* render_frame_host,
     const GURL& url) {
   int enabled_bindings =
       render_frame_host->render_view_host()->GetEnabledBindings();
   bool is_allowed_in_web_ui_renderer =
       WebUIControllerFactoryRegistry::GetInstance()->IsURLAcceptableForWebUI(
           controller_->GetBrowserContext(), url);
   if ((enabled_bindings & BINDINGS_POLICY_WEB_UI) &&
       !is_allowed_in_web_ui_renderer) {
     // Log the URL to help us diagnose any future failures of this CHECK.
     GetContentClient()->SetActiveURL(url);
     CHECK(0);
   }
 }
 
 }  // namespace content