| 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 fbd5546d4b9578343c0a6417cfc7ee6886ff5602..c7e28edba8cecc8fe34fd4ddec52819f4afa5a6d 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
|
| @@ -23,13 +23,13 @@ ProtocolPageLoadMetricsObserver::OnCommit(
|
|
|
| page_load_metrics::PageLoadMetricsObserver::ObservePolicy
|
| ProtocolPageLoadMetricsObserver::OnHidden(
|
| - const page_load_metrics::PageLoadTiming& timing,
|
| + const page_load_metrics::mojom::PageLoadTiming& timing,
|
| const page_load_metrics::PageLoadExtraInfo& info) {
|
| return STOP_OBSERVING;
|
| }
|
|
|
| void ProtocolPageLoadMetricsObserver::OnParseStart(
|
| - const page_load_metrics::PageLoadTiming& timing,
|
| + const page_load_metrics::mojom::PageLoadTiming& timing,
|
| const page_load_metrics::PageLoadExtraInfo& info) {
|
| switch (connection_info_) {
|
| case net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN:
|
| @@ -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_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_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:
|
| @@ -63,13 +63,13 @@ void ProtocolPageLoadMetricsObserver::OnParseStart(
|
| case net::HttpResponseInfo::CONNECTION_INFO_QUIC_40:
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.ParseTiming.NavigationToParseStart",
|
| - timing.parse_timing.parse_start.value());
|
| + timing.parse_timing->parse_start.value());
|
| break;
|
| }
|
| }
|
|
|
| void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaintInPage(
|
| - const page_load_metrics::PageLoadTiming& timing,
|
| + const page_load_metrics::mojom::PageLoadTiming& timing,
|
| const page_load_metrics::PageLoadExtraInfo& extra_info) {
|
| switch (connection_info_) {
|
| case net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN:
|
| @@ -85,23 +85,23 @@ void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaintInPage(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - timing.paint_timing.first_contentful_paint.value());
|
| + timing.paint_timing->first_contentful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.PaintTiming."
|
| "ParseStartToFirstContentfulPaint",
|
| - timing.paint_timing.first_contentful_paint.value() -
|
| - timing.parse_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.paint_timing.first_contentful_paint.value());
|
| + timing.paint_timing->first_contentful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.PaintTiming."
|
| "ParseStartToFirstContentfulPaint",
|
| - timing.paint_timing.first_contentful_paint.value() -
|
| - timing.parse_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:
|
| @@ -116,18 +116,18 @@ void ProtocolPageLoadMetricsObserver::OnFirstContentfulPaintInPage(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - timing.paint_timing.first_contentful_paint.value());
|
| + timing.paint_timing->first_contentful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.PaintTiming."
|
| "ParseStartToFirstContentfulPaint",
|
| - timing.paint_timing.first_contentful_paint.value() -
|
| - timing.parse_timing.parse_start.value());
|
| + timing.paint_timing->first_contentful_paint.value() -
|
| + timing.parse_timing->parse_start.value());
|
| break;
|
| }
|
| }
|
|
|
| void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaintInMainFrameDocument(
|
| - const page_load_metrics::PageLoadTiming& timing,
|
| + const page_load_metrics::mojom::PageLoadTiming& timing,
|
| const page_load_metrics::PageLoadExtraInfo& extra_info) {
|
| switch (connection_info_) {
|
| case net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN:
|
| @@ -143,23 +143,23 @@ void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaintInMainFrameDocument(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.Experimental.PaintTiming."
|
| "NavigationToFirstMeaningfulPaint",
|
| - timing.paint_timing.first_meaningful_paint.value());
|
| + timing.paint_timing->first_meaningful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.Experimental.PaintTiming."
|
| "ParseStartToFirstMeaningfulPaint",
|
| - timing.paint_timing.first_meaningful_paint.value() -
|
| - timing.parse_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.paint_timing.first_meaningful_paint.value());
|
| + timing.paint_timing->first_meaningful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H2.Experimental.PaintTiming."
|
| "ParseStartToFirstMeaningfulPaint",
|
| - timing.paint_timing.first_meaningful_paint.value() -
|
| - timing.parse_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:
|
| @@ -174,18 +174,18 @@ void ProtocolPageLoadMetricsObserver::OnFirstMeaningfulPaintInMainFrameDocument(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.Experimental.PaintTiming."
|
| "NavigationToFirstMeaningfulPaint",
|
| - timing.paint_timing.first_meaningful_paint.value());
|
| + timing.paint_timing->first_meaningful_paint.value());
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.Experimental.PaintTiming."
|
| "ParseStartToFirstMeaningfulPaint",
|
| - timing.paint_timing.first_meaningful_paint.value() -
|
| - timing.parse_timing.parse_start.value());
|
| + timing.paint_timing->first_meaningful_paint.value() -
|
| + timing.parse_timing->parse_start.value());
|
| break;
|
| }
|
| }
|
|
|
| void ProtocolPageLoadMetricsObserver::OnDomContentLoadedEventStart(
|
| - const page_load_metrics::PageLoadTiming& timing,
|
| + const page_load_metrics::mojom::PageLoadTiming& timing,
|
| const page_load_metrics::PageLoadExtraInfo& extra_info) {
|
| switch (connection_info_) {
|
| case net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN:
|
| @@ -201,13 +201,13 @@ void ProtocolPageLoadMetricsObserver::OnDomContentLoadedEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - timing.document_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.document_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:
|
| @@ -222,13 +222,13 @@ void ProtocolPageLoadMetricsObserver::OnDomContentLoadedEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - timing.document_timing.dom_content_loaded_event_start.value());
|
| + timing.document_timing->dom_content_loaded_event_start.value());
|
| break;
|
| }
|
| }
|
|
|
| void ProtocolPageLoadMetricsObserver::OnLoadEventStart(
|
| - const page_load_metrics::PageLoadTiming& timing,
|
| + const page_load_metrics::mojom::PageLoadTiming& timing,
|
| const page_load_metrics::PageLoadExtraInfo& extra_info) {
|
| switch (connection_info_) {
|
| case net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN:
|
| @@ -244,13 +244,13 @@ void ProtocolPageLoadMetricsObserver::OnLoadEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.H11.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - timing.document_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.document_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:
|
| @@ -265,7 +265,7 @@ void ProtocolPageLoadMetricsObserver::OnLoadEventStart(
|
| PAGE_LOAD_HISTOGRAM(
|
| "PageLoad.Clients.Protocol.QUIC.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - timing.document_timing.load_event_start.value());
|
| + timing.document_timing->load_event_start.value());
|
| break;
|
| }
|
| }
|
|
|