| Index: chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
|
| diff --git a/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
|
| index 462b30cb0341d0a1de7bc791c3a94ebe64e513ca..c43ac5ae6b5fb1e5fb0b1991145f100f55f307d5 100644
|
| --- a/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
|
| +++ b/chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer.cc
|
| @@ -44,12 +44,12 @@ void ProtocolPageLoadMetricsObserver::OnParseStart(
|
| case net::HttpResponseInfo::CONNECTION_INFO_HTTP1_1:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.ParseTiming.NavigationToParseStart",
|
| - timing.parse_start.value());
|
| + timing.parse_timing.parse_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.ParseTiming.NavigationToParseStart",
|
| - timing.parse_start.value());
|
| + timing.parse_timing.parse_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_32:
|
| @@ -61,7 +61,7 @@ void ProtocolPageLoadMetricsObserver::OnParseStart(
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_38:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.ParseTiming.NavigationToParseStart",
|
| - timing.parse_start.value());
|
| + timing.parse_timing.parse_start.value());
|
| break;
|
| }
|
| }
|
| @@ -83,21 +83,23 @@ void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaint(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - timing.first_contentful_paint.value());
|
| + timing.paint_timing.first_contentful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.PaintTiming."
|
| "ParseStartToFirstContentfulPaint",
|
| - timing.first_contentful_paint.value() - timing.parse_start.value());
|
| + timing.paint_timing.first_contentful_paint.value() -
|
| + timing.parse_timing.parse_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - timing.first_contentful_paint.value());
|
| + timing.paint_timing.first_contentful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.PaintTiming."
|
| "ParseStartToFirstContentfulPaint",
|
| - timing.first_contentful_paint.value() - timing.parse_start.value());
|
| + timing.paint_timing.first_contentful_paint.value() -
|
| + timing.parse_timing.parse_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_32:
|
| @@ -110,11 +112,12 @@ void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaint(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - timing.first_contentful_paint.value());
|
| + timing.paint_timing.first_contentful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.PaintTiming."
|
| "ParseStartToFirstContentfulPaint",
|
| - timing.first_contentful_paint.value() - timing.parse_start.value());
|
| + timing.paint_timing.first_contentful_paint.value() -
|
| + timing.parse_timing.parse_start.value());
|
| break;
|
| }
|
| }
|
| @@ -136,21 +139,23 @@ void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaint(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.Experimental.PaintTiming."
|
| "NavigationToFirstMeaningfulPaint",
|
| - timing.first_meaningful_paint.value());
|
| + timing.paint_timing.first_meaningful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.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());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.Experimental.PaintTiming."
|
| "NavigationToFirstMeaningfulPaint",
|
| - timing.first_meaningful_paint.value());
|
| + timing.paint_timing.first_meaningful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.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());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_32:
|
| @@ -163,11 +168,12 @@ void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaint(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.Experimental.PaintTiming."
|
| "NavigationToFirstMeaningfulPaint",
|
| - timing.first_meaningful_paint.value());
|
| + timing.paint_timing.first_meaningful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.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());
|
| break;
|
| }
|
| }
|
| @@ -189,13 +195,13 @@ void ProtocolPageLoadMetricsObserver::OnDomContentLoadedEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - timing.dom_content_loaded_event_start.value());
|
| + timing.document_timing.dom_content_loaded_event_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - timing.dom_content_loaded_event_start.value());
|
| + timing.document_timing.dom_content_loaded_event_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_32:
|
| @@ -208,7 +214,7 @@ void ProtocolPageLoadMetricsObserver::OnDomContentLoadedEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - timing.dom_content_loaded_event_start.value());
|
| + timing.document_timing.dom_content_loaded_event_start.value());
|
| break;
|
| }
|
| }
|
| @@ -230,13 +236,13 @@ void ProtocolPageLoadMetricsObserver::OnLoadEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - timing.load_event_start.value());
|
| + timing.document_timing.load_event_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_HTTP2:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - timing.load_event_start.value());
|
| + timing.document_timing.load_event_start.value());
|
| break;
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_32:
|
| @@ -249,7 +255,7 @@ void ProtocolPageLoadMetricsObserver::OnLoadEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - timing.load_event_start.value());
|
| + timing.document_timing.load_event_start.value());
|
| break;
|
| }
|
| }
|
|
|