Index: third_party/WebKit/Source/modules/sensor/SensorReading.cpp |
diff --git a/third_party/WebKit/Source/modules/sensor/SensorReading.cpp b/third_party/WebKit/Source/modules/sensor/SensorReading.cpp |
index 9eb63d020623789918c2b59697b9332bb8155687..85da7f1c4862757b27712ae4f8b028606099ab11 100644 |
--- a/third_party/WebKit/Source/modules/sensor/SensorReading.cpp |
+++ b/third_party/WebKit/Source/modules/sensor/SensorReading.cpp |
@@ -4,33 +4,35 @@ |
#include "modules/sensor/SensorReading.h" |
+#include "core/dom/ExecutionContext.h" |
+#include "core/frame/LocalDOMWindow.h" |
+#include "core/timing/DOMWindowPerformance.h" |
+#include "core/timing/Performance.h" |
+ |
namespace blink { |
-SensorReading::SensorReading() |
+SensorReading::SensorReading(SensorProxy* sensorProxy) |
+ : m_sensorProxy(sensorProxy) |
{ |
+ DCHECK(m_sensorProxy); |
} |
-SensorReading::SensorReading(bool providesTimeStamp, DOMHighResTimeStamp timeStamp) |
- : m_canProvideTimeStamp(providesTimeStamp) |
- , m_timeStamp(timeStamp) |
+DEFINE_TRACE(SensorReading) |
{ |
+ visitor->trace(m_sensorProxy); |
} |
-DOMHighResTimeStamp SensorReading::timeStamp(bool& isNull) |
+DOMHighResTimeStamp SensorReading::timeStamp(ScriptState* scriptState) const |
{ |
- if (m_canProvideTimeStamp) |
- return m_timeStamp; |
- |
- isNull = true; |
- return 0; |
-} |
+ LocalDOMWindow* window = scriptState->domWindow(); |
+ if (!window) |
+ return 0.0; |
-SensorReading::~SensorReading() |
-{ |
-} |
+ Performance* performance = DOMWindowPerformance::performance(*window); |
+ if (!performance) |
haraken
2016/09/07 15:53:43
This should be never null.
Mikhail
2016/09/07 18:37:23
Done.
|
+ return 0.0; |
-DEFINE_TRACE(SensorReading) |
-{ |
+ return performance->monotonicTimeToDOMHighResTimeStamp(m_sensorProxy->reading().timestamp); |
} |
} // namespace blink |