Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc

Issue 2111073003: Update PageLoadTiming to use base::Optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@optionalbug
Patch Set: remove comment Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
diff --git a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
index 5710c995acd0a1389bb92a931ac4091181460072..0bb556682c91ee28678edf4d43a553a568ce4b12 100644
--- a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
+++ b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
@@ -51,47 +51,50 @@ PageLoadMetricsObserverTestHarness::~PageLoadMetricsObserverTestHarness() {}
// static
void PageLoadMetricsObserverTestHarness::PopulateRequiredTimingFields(
PageLoadTiming* inout_timing) {
- if (!inout_timing->first_contentful_paint.is_zero() &&
- inout_timing->first_paint.is_zero()) {
+ if (inout_timing->first_contentful_paint && !inout_timing->first_paint) {
inout_timing->first_paint = inout_timing->first_contentful_paint;
}
- if (!inout_timing->first_text_paint.is_zero() &&
- inout_timing->first_paint.is_zero()) {
+ if (inout_timing->first_text_paint && !inout_timing->first_paint) {
inout_timing->first_paint = inout_timing->first_text_paint;
}
- if (!inout_timing->first_image_paint.is_zero() &&
- inout_timing->first_paint.is_zero()) {
+ if (inout_timing->first_image_paint && !inout_timing->first_paint) {
inout_timing->first_paint = inout_timing->first_image_paint;
}
- if (!inout_timing->first_paint.is_zero() &&
- inout_timing->first_layout.is_zero()) {
+ if (inout_timing->first_paint && !inout_timing->first_layout) {
inout_timing->first_layout = inout_timing->first_paint;
}
- if (!inout_timing->load_event_start.is_zero() &&
- inout_timing->dom_content_loaded_event_start.is_zero()) {
+ if (inout_timing->load_event_start &&
+ !inout_timing->dom_content_loaded_event_start) {
inout_timing->dom_content_loaded_event_start =
inout_timing->load_event_start;
}
- if (!inout_timing->first_layout.is_zero() &&
- inout_timing->dom_loading.is_zero()) {
+ if (inout_timing->first_layout && !inout_timing->dom_loading) {
inout_timing->dom_loading = inout_timing->first_layout;
}
- if (!inout_timing->dom_content_loaded_event_start.is_zero() &&
- inout_timing->dom_loading.is_zero()) {
+ if (inout_timing->dom_content_loaded_event_start &&
+ !inout_timing->dom_loading) {
inout_timing->dom_loading = inout_timing->dom_content_loaded_event_start;
}
- if (!inout_timing->parse_stop.is_zero() &&
- inout_timing->parse_start.is_zero()) {
+ if (inout_timing->dom_loading && !inout_timing->parse_start) {
+ inout_timing->parse_start = inout_timing->dom_loading;
+ }
+ if (inout_timing->parse_stop && !inout_timing->parse_start) {
inout_timing->parse_start = inout_timing->parse_stop;
}
- if (!inout_timing->parse_start.is_zero() &&
- inout_timing->response_start.is_zero()) {
+ if (inout_timing->parse_start && !inout_timing->response_start) {
inout_timing->response_start = inout_timing->parse_start;
}
- if (!inout_timing->dom_loading.is_zero() &&
- inout_timing->response_start.is_zero()) {
+ if (inout_timing->dom_loading && !inout_timing->response_start) {
inout_timing->response_start = inout_timing->dom_loading;
}
+ if (inout_timing->parse_start) {
+ if (!inout_timing->parse_blocked_on_script_load_duration)
+ inout_timing->parse_blocked_on_script_load_duration = base::TimeDelta();
+ if (!inout_timing
+ ->parse_blocked_on_script_load_from_document_write_duration)
+ inout_timing->parse_blocked_on_script_load_from_document_write_duration =
+ base::TimeDelta();
+ }
}
void PageLoadMetricsObserverTestHarness::SetUp() {

Powered by Google App Engine
This is Rietveld 408576698