| Index: chrome/common/page_load_metrics/page_load_metrics_messages.h
|
| diff --git a/chrome/common/page_load_metrics/page_load_metrics_messages.h b/chrome/common/page_load_metrics/page_load_metrics_messages.h
|
| index 82b028d2748cb28962cd5c21c62f43d1ac8d97a4..6853fdf65bfa92e94761ef39f9689b3513debf1b 100644
|
| --- a/chrome/common/page_load_metrics/page_load_metrics_messages.h
|
| +++ b/chrome/common/page_load_metrics/page_load_metrics_messages.h
|
| @@ -6,6 +6,7 @@
|
| // Multiply-included message file, hence no include guard.
|
|
|
| #include "base/time/time.h"
|
| +#include "chrome/common/page_load_metrics/page_load_metrics_param_traits.h"
|
| #include "chrome/common/page_load_metrics/page_load_timing.h"
|
| #include "ipc/ipc_message_macros.h"
|
|
|
| @@ -13,13 +14,13 @@
|
|
|
| // See comments in page_load_timing.h for details on each field.
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::DocumentTiming)
|
| +IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::mojom::DocumentTiming)
|
| IPC_STRUCT_TRAITS_MEMBER(dom_content_loaded_event_start)
|
| IPC_STRUCT_TRAITS_MEMBER(load_event_start)
|
| IPC_STRUCT_TRAITS_MEMBER(first_layout)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::PaintTiming)
|
| +IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::mojom::PaintTiming)
|
| IPC_STRUCT_TRAITS_MEMBER(first_paint)
|
| IPC_STRUCT_TRAITS_MEMBER(first_text_paint)
|
| IPC_STRUCT_TRAITS_MEMBER(first_image_paint)
|
| @@ -27,7 +28,7 @@ IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::PaintTiming)
|
| IPC_STRUCT_TRAITS_MEMBER(first_meaningful_paint)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::ParseTiming)
|
| +IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::mojom::ParseTiming)
|
| IPC_STRUCT_TRAITS_MEMBER(parse_start)
|
| IPC_STRUCT_TRAITS_MEMBER(parse_stop)
|
| IPC_STRUCT_TRAITS_MEMBER(parse_blocked_on_script_load_duration)
|
| @@ -38,26 +39,19 @@ IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::ParseTiming)
|
| parse_blocked_on_script_execution_from_document_write_duration)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::StyleSheetTiming)
|
| +IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::mojom::StyleSheetTiming)
|
| IPC_STRUCT_TRAITS_MEMBER(author_style_sheet_parse_duration_before_fcp)
|
| IPC_STRUCT_TRAITS_MEMBER(update_style_duration_before_fcp)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::PageLoadTiming)
|
| - IPC_STRUCT_TRAITS_MEMBER(navigation_start)
|
| - IPC_STRUCT_TRAITS_MEMBER(response_start)
|
| - IPC_STRUCT_TRAITS_MEMBER(document_timing)
|
| - IPC_STRUCT_TRAITS_MEMBER(paint_timing)
|
| - IPC_STRUCT_TRAITS_MEMBER(parse_timing)
|
| - IPC_STRUCT_TRAITS_MEMBER(style_sheet_timing)
|
| -IPC_STRUCT_TRAITS_END()
|
| +// page_load_metrics::mojom::PageLoadTiming has custom ParamTraits.
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::PageLoadMetadata)
|
| +IPC_STRUCT_TRAITS_BEGIN(page_load_metrics::mojom::PageLoadMetadata)
|
| IPC_STRUCT_TRAITS_MEMBER(behavior_flags)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| // Sent from renderer to browser process when the PageLoadTiming for the
|
| // associated frame changed.
|
| IPC_MESSAGE_ROUTED2(PageLoadMetricsMsg_TimingUpdated,
|
| - page_load_metrics::PageLoadTiming,
|
| - page_load_metrics::PageLoadMetadata)
|
| + page_load_metrics::mojom::PageLoadTiming,
|
| + page_load_metrics::mojom::PageLoadMetadata)
|
|
|