Updates to Server-Timing in accordance with with spec changes

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 16 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef PerformanceResourceTiming_h
 #define PerformanceResourceTiming_h
 
 #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"
 
 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;
   DOMHighResTimeStamp workerStart() const;
   virtual DOMHighResTimeStamp redirectStart() const;
   virtual DOMHighResTimeStamp redirectEnd() const;
   virtual DOMHighResTimeStamp fetchStart() const;
   DOMHighResTimeStamp domainLookupStart() const;
   DOMHighResTimeStamp domainLookupEnd() const;
   DOMHighResTimeStamp connectStart() const;
   DOMHighResTimeStamp connectEnd() const;
   DOMHighResTimeStamp secureConnectionStart() const;
   DOMHighResTimeStamp requestStart() const;
   DOMHighResTimeStamp responseStart() const;
   virtual DOMHighResTimeStamp responseEnd() const;
   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;
 
   // This constructor is for PerformanceNavigationTiming.
   // Related doc: https://goo.gl/uNecAj.
   PerformanceResourceTiming(const String& name,
                             const String& entry_type,
                             double start_time,
-                            double duration);
+                            double duration,
+                            PerformanceServerTimingVector&);
 
  private:
   PerformanceResourceTiming(const ResourceTimingInfo&,
                             double time_origin,
                             double start_time,
                             double last_redirect_end_time,
                             bool allow_timing_details,
-                            bool allow_redirect_details);
+                            bool allow_redirect_details,
+                            PerformanceServerTimingVector&);
 
   double WorkerReady() const;
 
   virtual ResourceLoadTiming* GetResourceLoadTiming() const;
   virtual bool AllowTimingDetails() const;
   virtual bool DidReuseConnection() const;
   virtual unsigned long long GetTransferSize() const;
   virtual unsigned long long GetEncodedBodySize() const;
   virtual unsigned long long GetDecodedBodySize() const;
 
   AtomicString initiator_type_;
   double time_origin_;
   RefPtr<ResourceLoadTiming> timing_;
   double last_redirect_end_time_;
   double finish_time_;
   unsigned long long transfer_size_;
   unsigned long long encoded_body_size_;
   unsigned long long decoded_body_size_;
   bool did_reuse_connection_;
   bool allow_timing_details_;
   bool allow_redirect_details_;
   bool allow_negative_value_;
+  PerformanceServerTimingVector serverTiming_;
 };
 
 }  // namespace blink
 
 #endif  // PerformanceResourceTiming_h