[Page Load Metrics] Structure PageLoadTiming.

chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer.h"
 
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
@@ skipping 275 matching lines @@
   base::Optional<base::TimeDelta> load_event_start;
   base::Optional<base::TimeDelta> first_image_paint;
   base::Optional<base::TimeDelta> first_contentful_paint;
   base::Optional<base::TimeDelta> experimental_first_meaningful_paint;
   base::Optional<base::TimeDelta> parse_blocked_on_script_load_duration;
   base::Optional<base::TimeDelta> parse_stop;
   if (WasStartedInForegroundOptionalEventInForeground(timing.response_start,
                                                       info)) {
     response_start = timing.response_start;
   }
-  if (WasStartedInForegroundOptionalEventInForeground(timing.load_event_start,
-                                                      info)) {
-    load_event_start = timing.load_event_start;
-  }
-  if (WasStartedInForegroundOptionalEventInForeground(timing.first_image_paint,
-                                                      info)) {
-    first_image_paint = timing.first_image_paint;
+  if (WasStartedInForegroundOptionalEventInForeground(
+          timing.document_timing.load_event_start, info)) {
+    load_event_start = timing.document_timing.load_event_start;
   }
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_contentful_paint, info)) {
-    first_contentful_paint = timing.first_contentful_paint;
+          timing.paint_timing.first_image_paint, info)) {
+    first_image_paint = timing.paint_timing.first_image_paint;
   }
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.first_meaningful_paint, info)) {
-    experimental_first_meaningful_paint = timing.first_meaningful_paint;
+          timing.paint_timing.first_contentful_paint, info)) {
+    first_contentful_paint = timing.paint_timing.first_contentful_paint;
   }
   if (WasStartedInForegroundOptionalEventInForeground(
-          timing.parse_blocked_on_script_load_duration, info)) {
+          timing.paint_timing.first_meaningful_paint, info)) {
+    experimental_first_meaningful_paint =
+        timing.paint_timing.first_meaningful_paint;
+  }
+  if (WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_blocked_on_script_load_duration, info)) {
     parse_blocked_on_script_load_duration =
-        timing.parse_blocked_on_script_load_duration;
+        timing.parse_timing.parse_blocked_on_script_load_duration;
   }
-  if (WasStartedInForegroundOptionalEventInForeground(timing.parse_stop,
-                                                      info)) {
-    parse_stop = timing.parse_stop;
+  if (WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_stop, info)) {
+    parse_stop = timing.parse_timing.parse_stop;
   }
 
   DataReductionProxyPageLoadTiming data_reduction_proxy_timing(
       timing.navigation_start, response_start, load_event_start,
       first_image_paint, first_contentful_paint,
       experimental_first_meaningful_paint,
       parse_blocked_on_script_load_duration, parse_stop, network_bytes_,
       original_network_bytes_);
   GetPingbackClient()->SendPingback(*data_, data_reduction_proxy_timing);
 }
 
 void DataReductionProxyMetricsObserver::OnDomContentLoadedEventStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.dom_content_loaded_event_start,
+      info, data_, timing.document_timing.dom_content_loaded_event_start,
       internal::kHistogramDOMContentLoadedEventFiredSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnLoadEventStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.load_event_start,
+      info, data_, timing.document_timing.load_event_start,
       internal::kHistogramLoadEventFiredSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnFirstLayout(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.first_layout, internal::kHistogramFirstLayoutSuffix);
+      info, data_, timing.document_timing.first_layout,
+      internal::kHistogramFirstLayoutSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnFirstPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(info, data_, timing.first_paint,
+  RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(info, data_,
+                                          timing.paint_timing.first_paint,
                                           internal::kHistogramFirstPaintSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnFirstTextPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.first_text_paint,
+      info, data_, timing.paint_timing.first_text_paint,
       internal::kHistogramFirstTextPaintSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnFirstImagePaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.first_image_paint,
+      info, data_, timing.paint_timing.first_image_paint,
       internal::kHistogramFirstImagePaintSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnFirstContentfulPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.first_contentful_paint,
+      info, data_, timing.paint_timing.first_contentful_paint,
       internal::kHistogramFirstContentfulPaintSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnFirstMeaningfulPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(
-      info, data_, timing.first_meaningful_paint,
+      info, data_, timing.paint_timing.first_meaningful_paint,
       internal::kHistogramFirstMeaningfulPaintSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnParseStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(info, data_, timing.parse_start,
+  RECORD_FOREGROUND_HISTOGRAMS_FOR_SUFFIX(info, data_,
+                                          timing.parse_timing.parse_start,
                                           internal::kHistogramParseStartSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnParseStop(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(timing.parse_stop, info))
+  if (!WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_stop, info))
     return;
 
-  base::TimeDelta parse_duration =
-      timing.parse_stop.value() - timing.parse_start.value();
+  base::TimeDelta parse_duration = timing.parse_timing.parse_stop.value() -
+                                   timing.parse_timing.parse_start.value();
   RECORD_HISTOGRAMS_FOR_SUFFIX(data_, parse_duration,
                                internal::kHistogramParseDurationSuffix);
   RECORD_HISTOGRAMS_FOR_SUFFIX(
-      data_, timing.parse_blocked_on_script_load_duration.value(),
+      data_, timing.parse_timing.parse_blocked_on_script_load_duration.value(),
       internal::kHistogramParseBlockedOnScriptLoadSuffix);
 }
 
 void DataReductionProxyMetricsObserver::OnLoadedResource(
     const page_load_metrics::ExtraRequestInfo& extra_request_info) {
   if (extra_request_info.was_cached)
     return;
   original_network_bytes_ += extra_request_info.original_network_content_length;
   network_bytes_ += extra_request_info.raw_body_bytes;
   num_network_resources_++;
   if (!extra_request_info.data_reduction_proxy_used)
     return;
   num_data_reduction_proxy_resources_++;
   network_bytes_proxied_ += extra_request_info.raw_body_bytes;
 }
 
 DataReductionProxyPingbackClient*
 DataReductionProxyMetricsObserver::GetPingbackClient() const {
   return DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
              browser_context_)
       ->data_reduction_proxy_service()
       ->pingback_client();
 }
 
 }  // namespace data_reduction_proxy