Chromium Code Reviews| Index: chrome/common/page_load_metrics/page_load_timing.cc |
| diff --git a/chrome/common/page_load_metrics/page_load_timing.cc b/chrome/common/page_load_metrics/page_load_timing.cc |
| index f926f8d679a9856b830d528901c5801b5638b61a..e3c452307d921d66635e334a1f6d684c9e2a4b83 100644 |
| --- a/chrome/common/page_load_metrics/page_load_timing.cc |
| +++ b/chrome/common/page_load_metrics/page_load_timing.cc |
| @@ -6,112 +6,54 @@ |
| namespace page_load_metrics { |
| -DocumentTiming::DocumentTiming() {} |
| - |
| -DocumentTiming::DocumentTiming(const DocumentTiming& other) = default; |
| - |
| -DocumentTiming::~DocumentTiming() {} |
| - |
| -bool DocumentTiming::operator==(const DocumentTiming& other) const { |
| - return dom_content_loaded_event_start == |
| - other.dom_content_loaded_event_start && |
| - load_event_start == other.load_event_start && |
| - first_layout == other.first_layout; |
| -} |
| - |
| -bool DocumentTiming::IsEmpty() const { |
| - return !dom_content_loaded_event_start && !load_event_start && !first_layout; |
| -} |
| - |
| -PaintTiming::PaintTiming() {} |
| - |
| -PaintTiming::PaintTiming(const PaintTiming& other) = default; |
| - |
| -PaintTiming::~PaintTiming() {} |
| - |
| -bool PaintTiming::operator==(const PaintTiming& other) const { |
| - return first_paint == other.first_paint && |
| - first_text_paint == other.first_text_paint && |
| - first_image_paint == other.first_image_paint && |
| - first_contentful_paint == other.first_contentful_paint && |
| - first_meaningful_paint == other.first_meaningful_paint; |
| -} |
| - |
| -bool PaintTiming::IsEmpty() const { |
| - return !first_paint && !first_text_paint && !first_image_paint && |
| - !first_contentful_paint && !first_meaningful_paint; |
| +mojo::StructPtr<mojom::PageLoadTiming> CreatePageLoadTiming() { |
| + return mojom::PageLoadTiming::New( |
| + base::Time(), base::Optional<base::TimeDelta>(), |
| + mojom::DocumentTiming::New(), mojom::PaintTiming::New(), |
| + mojom::ParseTiming::New(), mojom::StyleSheetTiming::New()); |
| } |
| -ParseTiming::ParseTiming() {} |
| - |
| -ParseTiming::ParseTiming(const ParseTiming& other) = default; |
| - |
| -ParseTiming::~ParseTiming() {} |
| - |
| -bool ParseTiming::operator==(const ParseTiming& other) const { |
| - return parse_start == other.parse_start && parse_stop == other.parse_stop && |
| - parse_blocked_on_script_load_duration == |
| - other.parse_blocked_on_script_load_duration && |
| - parse_blocked_on_script_load_from_document_write_duration == |
| - other.parse_blocked_on_script_load_from_document_write_duration && |
| - parse_blocked_on_script_execution_duration == |
| - other.parse_blocked_on_script_execution_duration && |
| - parse_blocked_on_script_execution_from_document_write_duration == |
| - other |
| - .parse_blocked_on_script_execution_from_document_write_duration; |
| +bool IsEmpty(const page_load_metrics::mojom::DocumentTiming& timing) { |
| + return !timing.dom_content_loaded_event_start && !timing.load_event_start && |
| + !timing.first_layout; |
| } |
| -bool ParseTiming::IsEmpty() const { |
| - return !parse_start && !parse_stop && |
| - !parse_blocked_on_script_load_duration && |
| - !parse_blocked_on_script_load_from_document_write_duration && |
| - !parse_blocked_on_script_execution_duration && |
| - !parse_blocked_on_script_execution_from_document_write_duration; |
| -} |
| - |
| -StyleSheetTiming::StyleSheetTiming() {} |
| - |
| -StyleSheetTiming::StyleSheetTiming(const StyleSheetTiming& other) = default; |
| - |
| -StyleSheetTiming::~StyleSheetTiming() {} |
| - |
| -bool StyleSheetTiming::operator==(const StyleSheetTiming& other) const { |
| - return author_style_sheet_parse_duration_before_fcp == |
| - other.author_style_sheet_parse_duration_before_fcp && |
| - update_style_duration_before_fcp == |
| - other.update_style_duration_before_fcp; |
| +bool IsEmpty(const page_load_metrics::mojom::PaintTiming& timing) { |
| + return !timing.first_paint && !timing.first_text_paint && |
| + !timing.first_image_paint && !timing.first_contentful_paint && |
| + !timing.first_meaningful_paint; |
| } |
| -bool StyleSheetTiming::IsEmpty() const { |
| - return !author_style_sheet_parse_duration_before_fcp && |
| - !update_style_duration_before_fcp; |
| +bool IsEmpty(const page_load_metrics::mojom::ParseTiming& timing) { |
| + return !timing.parse_start && !timing.parse_stop && |
| + !timing.parse_blocked_on_script_load_duration && |
| + !timing.parse_blocked_on_script_load_from_document_write_duration && |
| + !timing.parse_blocked_on_script_execution_duration && |
| + !timing.parse_blocked_on_script_execution_from_document_write_duration; |
| } |
| -PageLoadTiming::PageLoadTiming() {} |
| - |
| -PageLoadTiming::PageLoadTiming(const PageLoadTiming& other) = default; |
| - |
| -PageLoadTiming::~PageLoadTiming() {} |
| - |
| -bool PageLoadTiming::operator==(const PageLoadTiming& other) const { |
| - return navigation_start == other.navigation_start && |
| - response_start == other.response_start && |
| - document_timing == other.document_timing && |
| - paint_timing == other.paint_timing && |
| - parse_timing == other.parse_timing && |
| - style_sheet_timing == other.style_sheet_timing; |
| +bool IsEmpty(const page_load_metrics::mojom::StyleSheetTiming& timing) { |
| + return !timing.author_style_sheet_parse_duration_before_fcp && |
| + !timing.update_style_duration_before_fcp; |
| } |
| -bool PageLoadTiming::IsEmpty() const { |
| - return navigation_start.is_null() && !response_start && |
| - document_timing.IsEmpty() && paint_timing.IsEmpty() && |
| - parse_timing.IsEmpty() && style_sheet_timing.IsEmpty(); |
| +bool IsEmpty(const page_load_metrics::mojom::PageLoadTiming& timing) { |
| + return timing.navigation_start.is_null() && !timing.response_start && |
| + (!timing.document_timing || |
| + page_load_metrics::IsEmpty(*timing.document_timing)) && |
| + (!timing.paint_timing || |
| + page_load_metrics::IsEmpty(*timing.paint_timing)) && |
| + (!timing.parse_timing || |
| + page_load_metrics::IsEmpty(*timing.parse_timing)) && |
| + (!timing.style_sheet_timing || |
| + page_load_metrics::IsEmpty(*timing.style_sheet_timing)); |
| } |
| -PageLoadMetadata::PageLoadMetadata() {} |
| - |
| -bool PageLoadMetadata::operator==(const PageLoadMetadata& other) const { |
| - return behavior_flags == other.behavior_flags; |
| +void InitPageLoadTimingForTest(mojom::PageLoadTiming* timing) { |
|
pasko
2017/05/15 17:23:04
Not opposing this change, rather asking for self-e
Ken Rockot(use gerrit already)
2017/05/15 17:38:23
Fields are default-constructed, but these fields a
|
| + timing->document_timing = mojom::DocumentTiming::New(); |
| + timing->paint_timing = mojom::PaintTiming::New(); |
| + timing->parse_timing = mojom::ParseTiming::New(); |
| + timing->style_sheet_timing = mojom::StyleSheetTiming::New(); |
| } |
| } // namespace page_load_metrics |