Index: third_party/WebKit/Source/modules/sensor/Accelerometer.cpp |
diff --git a/third_party/WebKit/Source/modules/sensor/Accelerometer.cpp b/third_party/WebKit/Source/modules/sensor/Accelerometer.cpp |
index 20b9ae3b157c54ecaae7a9648085594325c4faa4..2af1644f03d4ce083673a0726a43ad71768fe61d 100644 |
--- a/third_party/WebKit/Source/modules/sensor/Accelerometer.cpp |
+++ b/third_party/WebKit/Source/modules/sensor/Accelerometer.cpp |
@@ -6,7 +6,6 @@ |
#include "bindings/core/v8/ScriptPromise.h" |
#include "bindings/core/v8/ScriptPromiseResolver.h" |
-#include "modules/sensor/AccelerometerReading.h" |
using device::mojom::blink::SensorType; |
@@ -34,18 +33,20 @@ Accelerometer::Accelerometer(ExecutionContext* executionContext, |
: SensorType::LINEAR_ACCELERATION), |
m_accelerometerOptions(options) {} |
-AccelerometerReading* Accelerometer::reading() const { |
- return static_cast<AccelerometerReading*>(Sensor::reading()); |
+double Accelerometer::x(bool& isNull) const { |
+ return readingValue(0, isNull); |
} |
-bool Accelerometer::includesGravity() const { |
- return m_accelerometerOptions.includeGravity(); |
+double Accelerometer::y(bool& isNull) const { |
+ return readingValue(1, isNull); |
+} |
+ |
+double Accelerometer::z(bool& isNull) const { |
+ return readingValue(2, isNull); |
} |
-std::unique_ptr<SensorReadingFactory> |
-Accelerometer::createSensorReadingFactory() { |
- return std::unique_ptr<SensorReadingFactory>( |
- new SensorReadingFactoryImpl<AccelerometerReading>()); |
+bool Accelerometer::includesGravity() const { |
+ return m_accelerometerOptions.includeGravity(); |
} |
DEFINE_TRACE(Accelerometer) { |