OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/page_load_metrics/browser/page_load_metrics_util.h" | 5 #include "components/page_load_metrics/browser/page_load_metrics_util.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "components/page_load_metrics/browser/page_load_metrics_observer.h" | 9 #include "components/page_load_metrics/browser/page_load_metrics_observer.h" |
10 #include "components/page_load_metrics/common/page_load_timing.h" | 10 #include "components/page_load_metrics/common/page_load_timing.h" |
(...skipping 10 matching lines...) Expand all Loading... | |
21 // TODO (shivanisha) The above function is used for TimeDeltas coming over IPC. | 21 // TODO (shivanisha) The above function is used for TimeDeltas coming over IPC. |
22 // Merge these two when page_load_metrics only handles Optional TimeDelta | 22 // Merge these two when page_load_metrics only handles Optional TimeDelta |
23 // values in the browser process. | 23 // values in the browser process. |
24 bool WasStartedInForegroundOptionalEventInForeground( | 24 bool WasStartedInForegroundOptionalEventInForeground( |
25 const base::Optional<base::TimeDelta>& event, | 25 const base::Optional<base::TimeDelta>& event, |
26 const PageLoadExtraInfo& info) { | 26 const PageLoadExtraInfo& info) { |
27 return info.started_in_foreground && event && | 27 return info.started_in_foreground && event && |
28 (!info.first_background_time || | 28 (!info.first_background_time || |
29 event.value() <= info.first_background_time.value()); | 29 event.value() <= info.first_background_time.value()); |
30 } | 30 } |
31 | 31 |
shivanisha
2016/07/07 15:38:57
Can we remove WasStartedInForegroundEventInForegro
Bryan McQuade
2016/07/08 18:39:35
Ah, great, done, thanks!
| |
32 bool WasParseInForeground(base::TimeDelta parse_start, | 32 bool WasParseInForeground(const base::Optional<base::TimeDelta>& parse_start, |
33 base::TimeDelta parse_stop, | 33 const base::Optional<base::TimeDelta>& parse_stop, |
34 const PageLoadExtraInfo& info) { | 34 const PageLoadExtraInfo& info) { |
35 if (parse_start.is_zero()) { | 35 if (!parse_start) { |
36 return false; | 36 return false; |
37 } | 37 } |
38 const bool incomplete_parse_in_foreground = parse_stop.is_zero() && | 38 const bool incomplete_parse_in_foreground = |
39 info.started_in_foreground && | 39 !parse_stop && info.started_in_foreground && !info.first_background_time; |
40 !info.first_background_time; | |
41 | 40 |
42 return incomplete_parse_in_foreground || | 41 return incomplete_parse_in_foreground || |
43 WasStartedInForegroundEventInForeground(parse_stop, info); | 42 WasStartedInForegroundOptionalEventInForeground(parse_stop, info); |
44 } | 43 } |
45 } // namespace page_load_metrics | 44 } // namespace page_load_metrics |
OLD | NEW |