Updates to Server-Timing in accordance with with spec changes

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/timing/PerformanceNavigationTiming.h"
 
 #include "bindings/core/v8/V8ObjectBuilder.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentTiming.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/timing/PerformanceBase.h"
 #include "platform/loader/fetch/ResourceTimingInfo.h"
 
 namespace blink {
 
 PerformanceNavigationTiming::PerformanceNavigationTiming(
     LocalFrame* frame,
     ResourceTimingInfo* info,
-    double time_origin)
+    double time_origin,
+    PerformanceServerTimingVector& serverTiming)
     : PerformanceResourceTiming(info ? info->InitialURL().GetString() : "",
                                 "navigation",
                                 0.0,
-                                0.0),
+                                0.0,
+                                serverTiming),
       ContextClient(frame),
       time_origin_(time_origin),
       resource_timing_info_(info) {
   DCHECK(frame);
   DCHECK(info);
 }
 
 PerformanceNavigationTiming::~PerformanceNavigationTiming() {}
 
 DEFINE_TRACE(PerformanceNavigationTiming) {
   ContextClient::Trace(visitor);
-  PerformanceEntry::Trace(visitor);
+  PerformanceResourceTiming::Trace(visitor);
 }
 
 DocumentLoadTiming* PerformanceNavigationTiming::GetDocumentLoadTiming() const {
   DocumentLoader* loader = GetDocumentLoader();
   if (!loader)
     return nullptr;
 
   return &loader->GetTiming();
 }
 
@@ skipping 209 matching lines @@
   return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->ResponseEnd(), false /* allow_negative_value */);
 }
 
 // Overriding PerformanceEntry's attributes.
 DOMHighResTimeStamp PerformanceNavigationTiming::duration() const {
   return loadEventEnd();
 }
 
 void PerformanceNavigationTiming::BuildJSONValue(
+    ScriptState* script_state,
     V8ObjectBuilder& builder) const {
-  PerformanceResourceTiming::BuildJSONValue(builder);
+  PerformanceResourceTiming::BuildJSONValue(script_state, builder);
   builder.AddNumber("unloadEventStart", unloadEventStart());
   builder.AddNumber("unloadEventEnd", unloadEventEnd());
   builder.AddNumber("domInteractive", domInteractive());
   builder.AddNumber("domContentLoadedEventStart", domContentLoadedEventStart());
   builder.AddNumber("domContentLoadedEventEnd", domContentLoadedEventEnd());
   builder.AddNumber("domComplete", domComplete());
   builder.AddNumber("loadEventStart", loadEventStart());
   builder.AddNumber("loadEventEnd", loadEventEnd());
   builder.AddString("type", type());
   builder.AddNumber("redirectCount", redirectCount());
 }
 }