Updates to Server-Timing in accordance with with spec changes

third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp

Index: third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp
diff --git a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp
index 48678a8993855bdb47ea6837809bb3b98a80c850..d2d8acd907464e048fb006e69cb64336cc41b0e7 100644
--- a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp
+++ b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp
@@ -45,7 +45,8 @@ PerformanceResourceTiming::PerformanceResourceTiming(
     double start_time,
     double last_redirect_end_time,
     bool allow_timing_details,
-    bool allow_redirect_details)
+    bool allow_redirect_details,
+    PerformanceServerTimingVector& serverTiming)
     : PerformanceEntry(info.InitialURL().GetString(),
                        "resource",
                        PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
@@ -67,14 +68,20 @@ PerformanceResourceTiming::PerformanceResourceTiming(
       did_reuse_connection_(info.FinalResponse().ConnectionReused()),
       allow_timing_details_(allow_timing_details),
       allow_redirect_details_(allow_redirect_details),
-      allow_negative_value_(info.NegativeAllowed()) {}
+      allow_negative_value_(info.NegativeAllowed()) {
+  serverTiming_.AppendVector(serverTiming);

[Yoav Weiss, 2017/06/29 06:57:33]

Why AppendVector? serverTiming_ is empty here. I think it'd be clearer if you
simply initialize using `serverTiming_(serverTiming)`

+}
 
 // This constructor is for PerformanceNavigationTiming.
-PerformanceResourceTiming::PerformanceResourceTiming(const String& name,
-                                                     const String& entry_type,
-                                                     double start_time,
-                                                     double duration)
-    : PerformanceEntry(name, entry_type, start_time, duration) {}
+PerformanceResourceTiming::PerformanceResourceTiming(
+    const String& name,
+    const String& entry_type,
+    double start_time,
+    double duration,
+    PerformanceServerTimingVector& serverTiming)
+    : PerformanceEntry(name, entry_type, start_time, duration) {
+  serverTiming_.AppendVector(serverTiming);
+}
 
 PerformanceResourceTiming::~PerformanceResourceTiming() {}
 
@@ -274,6 +281,10 @@ unsigned long long PerformanceResourceTiming::decodedBodySize() const {
   return GetDecodedBodySize();
 }
 
+PerformanceServerTimingVector PerformanceResourceTiming::serverTiming() const {
+  return serverTiming_;
+}
+
 void PerformanceResourceTiming::BuildJSONValue(V8ObjectBuilder& builder) const {
   PerformanceEntry::BuildJSONValue(builder);
   builder.AddString("initiatorType", initiatorType());
@@ -294,4 +305,9 @@ void PerformanceResourceTiming::BuildJSONValue(V8ObjectBuilder& builder) const {
   builder.AddNumber("decodedBodySize", decodedBodySize());
 }
 
+DEFINE_TRACE(PerformanceResourceTiming) {
+  visitor->Trace(serverTiming_);
+  PerformanceEntry::Trace(visitor);
+}
+
 }  // namespace blink