| Index: third_party/WebKit/Source/core/timing/PerformanceServerTiming.cpp
|
| diff --git a/third_party/WebKit/Source/core/timing/PerformanceServerTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceServerTiming.cpp
|
| index 120613c1a004af37ed673a7f47916b422cc173e1..8e9435f88aef633dbff6f79d1c5745688e1b65f1 100644
|
| --- a/third_party/WebKit/Source/core/timing/PerformanceServerTiming.cpp
|
| +++ b/third_party/WebKit/Source/core/timing/PerformanceServerTiming.cpp
|
| @@ -3,20 +3,19 @@
|
| // found in the LICENSE file.
|
|
|
| #include "core/timing/PerformanceServerTiming.h"
|
| -
|
| #include "bindings/core/v8/V8ObjectBuilder.h"
|
| -#include "core/timing/PerformanceBase.h"
|
| #include "platform/wtf/text/WTFString.h"
|
|
|
| namespace blink {
|
|
|
| -PerformanceServerTiming::PerformanceServerTiming(const String& name,
|
| - const String& metric,
|
| - double duration,
|
| - const String& description)
|
| - : PerformanceEntry(name, "server", 0.0, duration),
|
| - metric_(metric),
|
| - description_(description) {}
|
| +PerformanceServerTiming::PerformanceServerTiming(const String& metric,
|
| + double value,
|
| + const String& description,
|
| + bool allow_timing_details)
|
| + : metric_(metric),
|
| + value_(value),
|
| + description_(description),
|
| + allow_timing_details_(allow_timing_details) {}
|
|
|
| PerformanceServerTiming::~PerformanceServerTiming() {}
|
|
|
| @@ -24,13 +23,17 @@ String PerformanceServerTiming::metric() const {
|
| return metric_;
|
| }
|
|
|
| +double PerformanceServerTiming::value() const {
|
| + return allow_timing_details_ ? value_ : 0.0;
|
| +}
|
| +
|
| String PerformanceServerTiming::description() const {
|
| - return description_;
|
| + return allow_timing_details_ ? description_ : "";
|
| }
|
|
|
| void PerformanceServerTiming::BuildJSONValue(V8ObjectBuilder& builder) const {
|
| - PerformanceEntry::BuildJSONValue(builder);
|
| builder.AddString("metric", metric());
|
| + builder.AddNumber("value", value());
|
| builder.AddString("description", description());
|
| }
|
|
|
|
|