Updates to Server-Timing in accordance with with spec changes

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

Index: third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h
diff --git a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h
index 53c1d8c15d84160201a094b43405feec3a09567e..d644ef11d3259dca79ab0276714340edd9683ffa 100644
--- a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h
+++ b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.h
@@ -34,6 +34,7 @@
 
 #include "core/dom/DOMHighResTimeStamp.h"
 #include "core/timing/PerformanceEntry.h"
+#include "core/timing/PerformanceServerTiming.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/Forward.h"
 
@@ -42,28 +43,36 @@ namespace blink {
 class ResourceLoadTiming;
 class ResourceTimingInfo;
 
+using PerformanceServerTimingVector =
+    HeapVector<Member<PerformanceServerTiming>>;

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

Remove the definition from here

+
 class CORE_EXPORT PerformanceResourceTiming : public PerformanceEntry {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   ~PerformanceResourceTiming() override;
-  static PerformanceResourceTiming* Create(const ResourceTimingInfo& info,
-                                           double time_origin,
-                                           double start_time,
-                                           double last_redirect_end_time,
-                                           bool allow_timing_details,
-                                           bool allow_redirect_details) {
+  static PerformanceResourceTiming* Create(
+      const ResourceTimingInfo& info,
+      double time_origin,
+      double start_time,
+      double last_redirect_end_time,
+      bool allow_timing_details,
+      bool allow_redirect_details,
+      PerformanceServerTimingVector& serverTiming) {
     return new PerformanceResourceTiming(
         info, time_origin, start_time, last_redirect_end_time,
-        allow_timing_details, allow_redirect_details);
+        allow_timing_details, allow_redirect_details, serverTiming);
   }
 
-  static PerformanceResourceTiming* Create(const ResourceTimingInfo& info,
-                                           double time_origin,
-                                           double start_time,
-                                           bool allow_timing_details) {
+  static PerformanceResourceTiming* Create(
+      const ResourceTimingInfo& info,
+      double time_origin,
+      double start_time,
+      bool allow_timing_details,
+      PerformanceServerTimingVector& serverTiming) {
     return new PerformanceResourceTiming(info, time_origin, start_time, 0.0,
-                                         allow_timing_details, false);
+                                         allow_timing_details, false,
+                                         serverTiming);
   }
   // Related doc: https://goo.gl/uNecAj.
   virtual AtomicString initiatorType() const;
@@ -82,6 +91,9 @@ class CORE_EXPORT PerformanceResourceTiming : public PerformanceEntry {
   unsigned long long transferSize() const;
   unsigned long long encodedBodySize() const;
   unsigned long long decodedBodySize() const;
+  PerformanceServerTimingVector serverTiming() const;
+
+  DECLARE_VIRTUAL_TRACE();
 
  protected:
   void BuildJSONValue(V8ObjectBuilder&) const override;
@@ -91,7 +103,8 @@ class CORE_EXPORT PerformanceResourceTiming : public PerformanceEntry {
   PerformanceResourceTiming(const String& name,
                             const String& entry_type,
                             double start_time,
-                            double duration);
+                            double duration,
+                            PerformanceServerTimingVector&);
 
  private:
   PerformanceResourceTiming(const ResourceTimingInfo&,
@@ -99,7 +112,8 @@ class CORE_EXPORT PerformanceResourceTiming : public PerformanceEntry {
                             double start_time,
                             double last_redirect_end_time,
                             bool allow_timing_details,
-                            bool allow_redirect_details);
+                            bool allow_redirect_details,
+                            PerformanceServerTimingVector&);
 
   double WorkerReady() const;
 
@@ -122,6 +136,7 @@ class CORE_EXPORT PerformanceResourceTiming : public PerformanceEntry {
   bool allow_timing_details_;
   bool allow_redirect_details_;
   bool allow_negative_value_;
+  PerformanceServerTimingVector serverTiming_;
 };
 
 }  // namespace blink