Chromium Code Reviews| Index: components/page_load_metrics/browser/metrics_web_contents_observer.cc |
| diff --git a/components/page_load_metrics/browser/metrics_web_contents_observer.cc b/components/page_load_metrics/browser/metrics_web_contents_observer.cc |
| index 3a1fbd9302c38026492c1c708a2043fa0efe8827..066cc2a1de749ab30dbb96ed8e2d68dab7408d9d 100644 |
| --- a/components/page_load_metrics/browser/metrics_web_contents_observer.cc |
| +++ b/components/page_load_metrics/browser/metrics_web_contents_observer.cc |
| @@ -49,14 +49,94 @@ bool IsValidPageLoadTiming(const PageLoadTiming& timing) { |
| } // namespace |
| +#define PAGE_LOAD_HISTOGRAM(name, sample) \ |
| + UMA_HISTOGRAM_CUSTOM_TIMES(name, sample, \ |
| + base::TimeDelta::FromMilliseconds(10), \ |
| + base::TimeDelta::FromMinutes(10), 100) |
| + |
| +PageLoadTracker::PageLoadTracker(bool in_foreground) : has_commit_(false) { |
| + if (in_foreground) |
| + background_time_ = base::Time::Max(); |
| +} |
| + |
| +PageLoadTracker::~PageLoadTracker() { |
| + if (has_commit_) |
| + RecordTimingHistograms(); |
| +} |
| + |
| +void PageLoadTracker::WebContentsHidden() { |
| + // Only log the first time we background in a given page load. |
| + if (!background_time_.is_max()) |
| + return; |
| + |
| + // This method is similar to how blink converts TimeTicks to epoch time. |
| + // There may be slight inaccuracies due to inter-process timestamps, but |
| + // this solution is the best we have right now. |
| + background_time_ = base::Time::FromDoubleT( |
| + (base::TimeTicks::Now() - base::TimeTicks::UnixEpoch()).InSecondsF()); |
| +} |
| + |
| +void PageLoadTracker::Commit() { |
| + has_commit_ = true; |
| +} |
| + |
| +bool PageLoadTracker::UpdateTiming(const PageLoadTiming& timing) { |
| + // Throw away IPCs that are not relevant to the current navigation. |
| + if (!timing_.navigation_start.is_null() && |
| + timing_.navigation_start != timing.navigation_start) { |
| + // TODO(csharrison) uma log a counter here |
| + return false; |
| + } |
| + if (IsValidPageLoadTiming(timing)) { |
| + timing_ = timing; |
| + return true; |
| + } |
| + return false; |
| +} |
| + |
| +void PageLoadTracker::RecordTimingHistograms() { |
| + DCHECK(has_commit_); |
| + // If we start in the foreground, |background_delta| will be extremely large |
| + // (Max() - nav_start), and if we start in the background, |background_delta| |
| + // will be extremely small (0 - nav_start). |
| + base::TimeDelta background_delta = |
|
Bryan McQuade
2015/09/29 00:32:19
Let's be a little more explicit about the handling
Bryan McQuade
2015/09/29 12:38:52
Actually, there are two cases we should handle exp
Charlie Harrison
2015/09/29 14:13:07
Good idea. Done.
|
| + background_time_ - timing_.navigation_start; |
| + if (!timing_.dom_content_loaded_event_start.is_zero()) { |
| + if (timing_.dom_content_loaded_event_start < background_delta) { |
| + PAGE_LOAD_HISTOGRAM( |
| + "PageLoad.Timing.NavigationToDOMContentLoadedEventFired", |
| + timing_.dom_content_loaded_event_start); |
| + } else { |
| + PAGE_LOAD_HISTOGRAM( |
| + "PageLoad.Timing.NavigationToDOMContentLoadedEventFired.BG", |
| + timing_.dom_content_loaded_event_start); |
| + } |
| + } |
| + if (!timing_.load_event_start.is_zero()) { |
| + if (timing_.load_event_start < background_delta) { |
| + PAGE_LOAD_HISTOGRAM("PageLoad.Timing.NavigationToLoadEventFired", |
| + timing_.load_event_start); |
| + } else { |
| + PAGE_LOAD_HISTOGRAM("PageLoad.Timing.NavigationToLoadEventFired.BG", |
| + timing_.load_event_start); |
| + } |
| + } |
| + if (!timing_.first_layout.is_zero()) { |
| + if (timing_.first_layout < background_delta) { |
| + PAGE_LOAD_HISTOGRAM("PageLoad.Timing.NavigationToFirstLayout", |
| + timing_.first_layout); |
| + } else { |
| + PAGE_LOAD_HISTOGRAM("PageLoad.Timing.NavigationToFirstLayout.BG", |
| + timing_.first_layout); |
| + } |
| + } |
| +} |
| + |
| MetricsWebContentsObserver::MetricsWebContentsObserver( |
| content::WebContents* web_contents) |
| - : content::WebContentsObserver(web_contents) {} |
| + : content::WebContentsObserver(web_contents), in_foreground_(false) {} |
| -// This object is tied to a single WebContents for its entire lifetime. |
| -MetricsWebContentsObserver::~MetricsWebContentsObserver() { |
| - RecordTimingHistograms(); |
| -} |
| +MetricsWebContentsObserver::~MetricsWebContentsObserver() {} |
| bool MetricsWebContentsObserver::OnMessageReceived( |
| const IPC::Message& message, |
| @@ -73,32 +153,57 @@ bool MetricsWebContentsObserver::OnMessageReceived( |
| void MetricsWebContentsObserver::DidFinishNavigation( |
| content::NavigationHandle* navigation_handle) { |
| + if (!navigation_handle->IsInMainFrame()) |
| + return; |
| + |
| + scoped_ptr<PageLoadTracker> finished_nav( |
| + provisional_loads_.take_and_erase(navigation_handle)); |
| + |
|
Bryan McQuade
2015/09/29 00:32:19
let's move the DCHECK from below up here:
DCHECK(f
Charlie Harrison
2015/09/29 14:13:07
Done.
|
| + // TODO(csharrison) handle the two error cases: |
| + // 1. Error pages that replace the previous page. |
| + // 2. Error pages that leave the user on the previous page. |
| + // For now these cases will be ignored. |
| if (!navigation_handle->HasCommitted()) |
|
Bryan McQuade
2015/09/29 00:32:19
what's the difference between testing !HasCommitte
Charlie Harrison
2015/09/29 14:13:07
IsErrorPage is true when HasCommitted is true and
|
| return; |
| - if (navigation_handle->IsInMainFrame() && !navigation_handle->IsSamePage()) |
| - RecordTimingHistograms(); |
| - if (IsRelevantNavigation(navigation_handle)) |
| - current_timing_.reset(new PageLoadTiming()); |
| + |
| + if (!IsRelevantNavigation(navigation_handle)) |
|
Bryan McQuade
2015/09/29 00:32:19
thinking about this more, I do think we should log
Charlie Harrison
2015/09/29 14:13:07
I have no objections to that! Done.
|
| + return; |
| + |
| + // Updating |committed_load_| will trigger RecordTimingHistograms on a |
| + // previous PageLoadTracker. |
| + committed_load_ = finished_nav.Pass(); |
| + DCHECK(committed_load_); |
| + committed_load_->Commit(); |
| } |
| -// This will occur when the process for the main RenderFrameHost exits. |
| -// This will happen with a normal exit or a crash. |
| -void MetricsWebContentsObserver::RenderProcessGone( |
|
Bryan McQuade
2015/09/29 00:32:19
if removing this causes us to log metrics less eag
Charlie Harrison
2015/09/29 14:13:07
Yeah I think it could. Done.
|
| - base::TerminationStatus status) { |
| - RecordTimingHistograms(); |
| +void MetricsWebContentsObserver::DidStartNavigation( |
|
Bryan McQuade
2015/09/29 00:32:19
let's put DidStartNavigation impl before DidFinish
Charlie Harrison
2015/09/29 14:13:07
Done.
|
| + content::NavigationHandle* navigation_handle) { |
| + if (!navigation_handle->IsInMainFrame()) |
| + return; |
| + // We can have two provisional loads in some cases. E.g. a same-site |
| + // navigation can have a concurrent cross-process navigation started |
| + // from the omnibox. |
| + DCHECK(provisional_loads_.size() < 2); |
| + provisional_loads_.insert( |
| + navigation_handle, make_scoped_ptr(new PageLoadTracker(in_foreground_))); |
| } |
| -#define PAGE_LOAD_HISTOGRAM(name, sample) \ |
| - UMA_HISTOGRAM_CUSTOM_TIMES(name, sample, \ |
| - base::TimeDelta::FromMilliseconds(10), \ |
| - base::TimeDelta::FromMinutes(10), 100); |
| +void MetricsWebContentsObserver::WasShown() { |
| + in_foreground_ = true; |
| +} |
| + |
| +void MetricsWebContentsObserver::WasHidden() { |
| + in_foreground_ = false; |
| + if (committed_load_) |
| + committed_load_->WebContentsHidden(); |
| + for (const auto& kv : provisional_loads_) { |
| + kv.second->WebContentsHidden(); |
| + } |
| +} |
| void MetricsWebContentsObserver::OnTimingUpdated( |
| content::RenderFrameHost* render_frame_host, |
| const PageLoadTiming& timing) { |
|
Bryan McQuade
2015/09/29 00:32:19
we used to have:
if (!current_timing)
return;
w
Charlie Harrison
2015/09/29 14:13:07
I removed it under the assumption that DidStartNav
|
| - if (!current_timing_) |
| - return; |
| - |
| // We may receive notifications from frames that have been navigated away |
| // from. We simply ignore them. |
| if (render_frame_host != web_contents()->GetMainFrame()) |
| @@ -110,36 +215,7 @@ void MetricsWebContentsObserver::OnTimingUpdated( |
| if (!web_contents()->GetLastCommittedURL().SchemeIsHTTPOrHTTPS()) |
| return; |
| - // Throw away IPCs that are not relevant to the current navigation. |
| - if (!current_timing_->navigation_start.is_null() && |
| - timing.navigation_start != current_timing_->navigation_start) { |
| - // TODO(csharrison) uma log a counter here |
| - return; |
| - } |
| - |
| - *current_timing_ = timing; |
| -} |
| - |
| -void MetricsWebContentsObserver::RecordTimingHistograms() { |
| - if (!current_timing_ || !IsValidPageLoadTiming(*current_timing_)) |
| - return; |
| - |
| - if (!current_timing_->dom_content_loaded_event_start.is_zero()) { |
| - PAGE_LOAD_HISTOGRAM( |
| - "PageLoad.Timing.NavigationToDOMContentLoadedEventFired", |
| - current_timing_->dom_content_loaded_event_start); |
| - } |
| - |
| - if (!current_timing_->load_event_start.is_zero()) { |
| - PAGE_LOAD_HISTOGRAM("PageLoad.Timing.NavigationToLoadEventFired", |
| - current_timing_->load_event_start); |
| - } |
| - |
| - if (!current_timing_->first_layout.is_zero()) { |
| - PAGE_LOAD_HISTOGRAM("PageLoad.Timing.NavigationToFirstLayout", |
| - current_timing_->first_layout); |
| - } |
| - current_timing_.reset(); |
| + committed_load_->UpdateTiming(timing); |
| } |
| bool MetricsWebContentsObserver::IsRelevantNavigation( |