Index: third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp |
diff --git a/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp |
index f0263af90ab5c02dcb7609f54bd718338b704a53..df433a2fcdd659dd84d2d6d063678350f10a480b 100644 |
--- a/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp |
+++ b/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp |
@@ -18,11 +18,13 @@ 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) { |
@@ -34,7 +36,7 @@ PerformanceNavigationTiming::~PerformanceNavigationTiming() {} |
DEFINE_TRACE(PerformanceNavigationTiming) { |
ContextClient::Trace(visitor); |
- PerformanceEntry::Trace(visitor); |
+ PerformanceResourceTiming::Trace(visitor); |
} |
DocumentLoadTiming* PerformanceNavigationTiming::GetDocumentLoadTiming() const { |
@@ -264,8 +266,9 @@ DOMHighResTimeStamp PerformanceNavigationTiming::duration() const { |
} |
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()); |