Index: content/browser/frame_host/render_frame_host_impl.cc |
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
index 66e303c7014acdd52679293465db1cf9609912df..298b1d3a35f2fdd6a29239acecb920420b017525 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -792,9 +792,12 @@ void RenderFrameHostImpl::OnDocumentOnLoadCompleted( |
delegate_->DocumentOnLoadCompleted(this); |
} |
-void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(const GURL& url) { |
- frame_tree_node_->navigator()->DidStartProvisionalLoad( |
- this, url); |
+void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( |
+ const GURL& url, |
+ const base::TimeTicks& navigation_start) { |
+ DCHECK(!navigation_start.is_null()); |
+ frame_tree_node_->navigator()->DidStartProvisionalLoad(this, url, |
+ navigation_start); |
} |
void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( |
@@ -932,9 +935,10 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) { |
// Synchronous renderer-initiated navigations will send a |
// DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad |
// message. |
+ // TODO(csharrison) Should we use a timestamp logged in the renderer here? |
if (!navigation_handle_) { |
navigation_handle_ = NavigationHandleImpl::Create( |
- validated_params.url, frame_tree_node_); |
+ validated_params.url, frame_tree_node_, base::TimeTicks::Now()); |
} |
accessibility_reset_count_ = 0; |
@@ -1769,8 +1773,8 @@ void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { |
CommonNavigationParams common_params( |
data_url, Referrer(), ui::PAGE_TRANSITION_LINK, |
FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), |
- FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), |
- LOFI_OFF); |
+ FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), LOFI_OFF, |
+ base::TimeTicks::Now()); |
if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableBrowserSideNavigation)) { |
CommitNavigation(nullptr, nullptr, common_params, |
@@ -2152,8 +2156,7 @@ void RenderFrameHostImpl::SetNavigationsSuspended( |
SetState(RenderFrameHostImpl::STATE_DEFAULT); |
DCHECK(!proceed_time.is_null()); |
- suspended_nav_params_->request_params.browser_navigation_start = |
- proceed_time; |
+ suspended_nav_params_->common_params.navigation_start = proceed_time; |
clamy
2015/11/03 13:33:00
This is somewhat problematic. We pushed the naviga
|
SendNavigateMessage(suspended_nav_params_->common_params, |
suspended_nav_params_->start_params, |
suspended_nav_params_->request_params); |