[Page Load Metrics] Structure PageLoadTiming.

chrome/common/page_load_metrics/page_load_timing.h

Index: chrome/common/page_load_metrics/page_load_timing.h
diff --git a/chrome/common/page_load_metrics/page_load_timing.h b/chrome/common/page_load_metrics/page_load_timing.h
index 6e08b50bd38414e1bc19635df0258c940dc70356..528718810e9d32e667c2a70425647a5a88c7a51e 100644
--- a/chrome/common/page_load_metrics/page_load_timing.h
+++ b/chrome/common/page_load_metrics/page_load_timing.h
@@ -11,61 +11,39 @@
 
 namespace page_load_metrics {
 
-struct StyleSheetTiming {
-  StyleSheetTiming();
-  StyleSheetTiming(const StyleSheetTiming& other);
-  ~StyleSheetTiming();
-
-  bool operator==(const StyleSheetTiming& other) const;
-  bool operator!=(const StyleSheetTiming& other) const {
-    return !(*this == other);
-  }
-
-  bool IsEmpty() const;
-
-  // Total time spent parsing author style sheets, before the first contentful
-  // paint.
-  base::Optional<base::TimeDelta> author_style_sheet_parse_duration_before_fcp;
-
-  // Time spent in Document::updateStyle before FCP.
-  base::Optional<base::TimeDelta> update_style_duration_before_fcp;
-};
-
-// PageLoadTiming contains timing metrics associated with a page load. Many of
-// the metrics here are based on the Navigation Timing spec:
-// http://www.w3.org/TR/navigation-timing/.
-struct PageLoadTiming {
- public:
-  PageLoadTiming();
-  PageLoadTiming(const PageLoadTiming& other);
-  ~PageLoadTiming();
+struct DocumentTiming {
+  DocumentTiming();
+  DocumentTiming(const DocumentTiming& other);
+  ~DocumentTiming();
 
-  bool operator==(const PageLoadTiming& other) const;
-  bool operator!=(const PageLoadTiming& other) const {
+  bool operator==(const DocumentTiming& other) const;
+  bool operator!=(const DocumentTiming& other) const {
     return !(*this == other);
   }
 
   bool IsEmpty() const;
 
-  // Time that the navigation for the associated page was initiated. Note that
-  // this field is only used for internal tracking purposes and should not be
-  // used by PageLoadMetricsObservers. This field will likely be removed in the
-  // future.
-  base::Time navigation_start;
-
-  // TimeDeltas relative to navigation_start:
-
-  // Time that the first byte of the response is received.
-  base::Optional<base::TimeDelta> response_start;
+  // TimeDeltas below relative to navigation start:
 
   // Time immediately before the DOMContentLoaded event is fired.
   base::Optional<base::TimeDelta> dom_content_loaded_event_start;
-
   // Time immediately before the load event is fired.
   base::Optional<base::TimeDelta> load_event_start;
-
   // Time when the first layout is completed.
   base::Optional<base::TimeDelta> first_layout;
+};
+
+struct PaintTiming {
+  PaintTiming();
+  PaintTiming(const PaintTiming& other);
+  ~PaintTiming();
+
+  bool operator==(const PaintTiming& other) const;
+  bool operator!=(const PaintTiming& other) const { return !(*this == other); }
+
+  bool IsEmpty() const;
+
+  // TimeDeltas below relative to navigation start:
 
   // Time when the first paint is performed.
   base::Optional<base::TimeDelta> first_paint;
@@ -77,7 +55,17 @@ struct PageLoadTiming {
   base::Optional<base::TimeDelta> first_contentful_paint;
   // (Experimental) Time when the page's primary content is painted.
   base::Optional<base::TimeDelta> first_meaningful_paint;
+};
+
+struct ParseTiming {
+  ParseTiming();
+  ParseTiming(const ParseTiming& other);
+  ~ParseTiming();
 
+  bool operator==(const ParseTiming& other) const;
+  bool operator!=(const ParseTiming& other) const { return !(*this == other); }
+
+  bool IsEmpty() const;
 
   // TimeDeltas below represent durations of time during the page load:
 
@@ -117,7 +105,57 @@ struct PageLoadTiming {
   // not currently covered by this field. See crbug/600711 for details.
   base::Optional<base::TimeDelta>
       parse_blocked_on_script_execution_from_document_write_duration;
+};
+
+struct StyleSheetTiming {
+  StyleSheetTiming();
+  StyleSheetTiming(const StyleSheetTiming& other);
+  ~StyleSheetTiming();
+
+  bool operator==(const StyleSheetTiming& other) const;
+  bool operator!=(const StyleSheetTiming& other) const {
+    return !(*this == other);
+  }
+
+  bool IsEmpty() const;
+
+  // Total time spent parsing author style sheets, before the first contentful
+  // paint.
+  base::Optional<base::TimeDelta> author_style_sheet_parse_duration_before_fcp;
+
+  // Time spent in Document::updateStyle before FCP.
+  base::Optional<base::TimeDelta> update_style_duration_before_fcp;
+};
+
+// PageLoadTiming contains timing metrics associated with a page load. Many of
+// the metrics here are based on the Navigation Timing spec:
+// http://www.w3.org/TR/navigation-timing/.
+struct PageLoadTiming {
+ public:
+  PageLoadTiming();
+  PageLoadTiming(const PageLoadTiming& other);
+  ~PageLoadTiming();
+
+  bool operator==(const PageLoadTiming& other) const;
+  bool operator!=(const PageLoadTiming& other) const {
+    return !(*this == other);
+  }
+
+  bool IsEmpty() const;
+
+  // Time that the navigation for the associated page was initiated. Note that
+  // this field is only used for internal tracking purposes and should not be
+  // used by PageLoadMetricsObservers. This field will likely be removed in the
+  // future.
+  base::Time navigation_start;
+
+  // Time relative to navigation_start that the first byte of the response is
+  // received.
+  base::Optional<base::TimeDelta> response_start;
 
+  DocumentTiming document_timing;
+  PaintTiming paint_timing;
+  ParseTiming parse_timing;
   StyleSheetTiming style_sheet_timing;
 
   // If you add additional members, also be sure to update operator==,