[Page Load Metrics] Structure PageLoadTiming.

chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
index 2345165389917219ebb33982a9bbdd60f37f8bd4..8d87021b53c5541afe842521a2362dd3cbbc85ba 100644
--- a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
@@ -159,16 +159,17 @@ void DocumentWritePageLoadMetricsObserver::
         const page_load_metrics::PageLoadTiming& timing,
         const page_load_metrics::PageLoadExtraInfo& info) {
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_contentful_paint, info)) {
+          timing.paint_timing.first_contentful_paint, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteFirstContentfulPaint,
-                        timing.first_contentful_paint.value());
+                        timing.paint_timing.first_contentful_paint.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteParseStartToFirstContentfulPaint,
-        timing.first_contentful_paint.value() - timing.parse_start.value());
+        timing.paint_timing.first_contentful_paint.value() -
+            timing.parse_timing.parse_start.value());
   } else {
     PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundHistogramDocWriteFirstContentfulPaint,
-        timing.first_contentful_paint.value());
+        timing.paint_timing.first_contentful_paint.value());
   }
 }
 
@@ -183,11 +184,12 @@ void DocumentWritePageLoadMetricsObserver::
         const page_load_metrics::PageLoadTiming& timing,
         const page_load_metrics::PageLoadExtraInfo& info) {
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_meaningful_paint, info)) {
+          timing.paint_timing.first_meaningful_paint, info)) {
     PAGE_LOAD_HISTOGRAM(
         "PageLoad.Clients.DocWrite.Evaluator.Experimental.PaintTiming."
         "ParseStartToFirstMeaningfulPaint",
-        timing.first_meaningful_paint.value() - timing.parse_start.value());
+        timing.paint_timing.first_meaningful_paint.value() -
+            timing.parse_timing.parse_start.value());
   }
 }
 
@@ -196,47 +198,50 @@ void DocumentWritePageLoadMetricsObserver::
         const page_load_metrics::PageLoadTiming& timing,
         const page_load_metrics::PageLoadExtraInfo& info) {
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_meaningful_paint, info)) {
+          timing.paint_timing.first_meaningful_paint, info)) {
     PAGE_LOAD_HISTOGRAM(
         "PageLoad.Clients.DocWrite.Block.Experimental.PaintTiming."
         "ParseStartToFirstMeaningfulPaint",
-        timing.first_meaningful_paint.value() - timing.parse_start.value());
+        timing.paint_timing.first_meaningful_paint.value() -
+            timing.parse_timing.parse_start.value());
   }
 }
 
 void DocumentWritePageLoadMetricsObserver::LogDocumentWriteEvaluatorParseStop(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  base::TimeDelta parse_duration =
-      timing.parse_stop.value() - timing.parse_start.value();
-  if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
-                                                      info)) {
+  base::TimeDelta parse_duration = timing.parse_timing.parse_stop.value() -
+                                   timing.parse_timing.parse_start.value();
+  if (WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_stop, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseDuration,
                         parse_duration);
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteParseBlockedOnScriptLoad,
-                        timing.parse_blocked_on_script_load_duration.value());
+    PAGE_LOAD_HISTOGRAM(
+        internal::kHistogramDocWriteParseBlockedOnScriptLoad,
+        timing.parse_timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
+        timing.parse_timing
+            .parse_blocked_on_script_load_from_document_write_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteParseBlockedOnScriptExecution,
-        timing.parse_blocked_on_script_execution_duration.value());
+        timing.parse_timing.parse_blocked_on_script_execution_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteParseBlockedOnScriptExecutionDocumentWrite,
-        timing.parse_blocked_on_script_execution_from_document_write_duration
+        timing.parse_timing
+            .parse_blocked_on_script_execution_from_document_write_duration
             .value());
   } else {
     PAGE_LOAD_HISTOGRAM(internal::kBackgroundHistogramDocWriteParseDuration,
                         parse_duration);
     PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundHistogramDocWriteParseBlockedOnScriptLoad,
-        timing.parse_blocked_on_script_load_duration.value());
+        timing.parse_timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::
             kBackgroundHistogramDocWriteParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
+        timing.parse_timing
+            .parse_blocked_on_script_load_from_document_write_duration.value());
   }
 }
 
@@ -245,38 +250,40 @@ void DocumentWritePageLoadMetricsObserver::
         const page_load_metrics::PageLoadTiming& timing,
         const page_load_metrics::PageLoadExtraInfo& info) {
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_contentful_paint, info)) {
+          timing.paint_timing.first_contentful_paint, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockFirstContentfulPaint,
-                        timing.first_contentful_paint.value());
+                        timing.paint_timing.first_contentful_paint.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
-        timing.first_contentful_paint.value() - timing.parse_start.value());
+        timing.paint_timing.first_contentful_paint.value() -
+            timing.parse_timing.parse_start.value());
   }
 }
 
 void DocumentWritePageLoadMetricsObserver::LogDocumentWriteBlockParseStop(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  base::TimeDelta parse_duration =
-      timing.parse_stop.value() - timing.parse_start.value();
-  if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
-                                                      info)) {
+  base::TimeDelta parse_duration = timing.parse_timing.parse_stop.value() -
+                                   timing.parse_timing.parse_start.value();
+  if (WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_stop, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramDocWriteBlockParseDuration,
                         parse_duration);
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteBlockParseBlockedOnScriptLoad,
-        timing.parse_blocked_on_script_load_duration.value());
+        timing.parse_timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteBlockParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
+        timing.parse_timing
+            .parse_blocked_on_script_load_from_document_write_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramDocWriteBlockParseBlockedOnScriptExecution,
-        timing.parse_blocked_on_script_execution_duration.value());
+        timing.parse_timing.parse_blocked_on_script_execution_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::
             kHistogramDocWriteBlockParseBlockedOnScriptExecutionDocumentWrite,
-        timing.parse_blocked_on_script_execution_from_document_write_duration
+        timing.parse_timing
+            .parse_blocked_on_script_execution_from_document_write_duration
             .value());
   } else {
     PAGE_LOAD_HISTOGRAM(
@@ -284,10 +291,10 @@ void DocumentWritePageLoadMetricsObserver::LogDocumentWriteBlockParseStop(
         parse_duration);
     PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundHistogramDocWriteBlockParseBlockedOnScriptLoad,
-        timing.parse_blocked_on_script_load_duration.value());
+        timing.parse_timing.parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundDocWriteBlockParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_blocked_on_script_load_from_document_write_duration
-            .value());
+        timing.parse_timing
+            .parse_blocked_on_script_load_from_document_write_duration.value());
   }
 }