| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/sensor/Accelerometer.h" | 5 #include "modules/sensor/Accelerometer.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromise.h" | 7 #include "bindings/core/v8/ScriptPromise.h" |
| 8 #include "bindings/core/v8/ScriptPromiseResolver.h" | 8 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 9 #include "modules/sensor/AccelerometerReading.h" | 9 #include "modules/sensor/AccelerometerReading.h" |
| 10 | 10 |
| 11 using device::mojom::blink::SensorType; | 11 using device::mojom::blink::SensorType; |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 Accelerometer* Accelerometer::create(ScriptState* scriptState, | 15 Accelerometer* Accelerometer::create(ExecutionContext* executionContext, |
| 16 const AccelerometerOptions& options, | 16 const AccelerometerOptions& options, |
| 17 ExceptionState& exceptionState) { | 17 ExceptionState& exceptionState) { |
| 18 return new Accelerometer(scriptState, options, exceptionState); | 18 return new Accelerometer(executionContext, options, exceptionState); |
| 19 } | 19 } |
| 20 | 20 |
| 21 // static | 21 // static |
| 22 Accelerometer* Accelerometer::create(ScriptState* scriptState, | 22 Accelerometer* Accelerometer::create(ExecutionContext* executionContext, |
| 23 ExceptionState& exceptionState) { | 23 ExceptionState& exceptionState) { |
| 24 return create(scriptState, AccelerometerOptions(), exceptionState); | 24 return create(executionContext, AccelerometerOptions(), exceptionState); |
| 25 } | 25 } |
| 26 | 26 |
| 27 Accelerometer::Accelerometer(ScriptState* scriptState, | 27 Accelerometer::Accelerometer(ExecutionContext* executionContext, |
| 28 const AccelerometerOptions& options, | 28 const AccelerometerOptions& options, |
| 29 ExceptionState& exceptionState) | 29 ExceptionState& exceptionState) |
| 30 : Sensor(scriptState, | 30 : Sensor(executionContext, |
| 31 options, | 31 options, |
| 32 exceptionState, | 32 exceptionState, |
| 33 options.includeGravity() ? SensorType::ACCELEROMETER | 33 options.includeGravity() ? SensorType::ACCELEROMETER |
| 34 : SensorType::LINEAR_ACCELERATION), | 34 : SensorType::LINEAR_ACCELERATION), |
| 35 m_accelerometerOptions(options) {} | 35 m_accelerometerOptions(options) {} |
| 36 | 36 |
| 37 AccelerometerReading* Accelerometer::reading() const { | 37 AccelerometerReading* Accelerometer::reading() const { |
| 38 return static_cast<AccelerometerReading*>(Sensor::reading()); | 38 return static_cast<AccelerometerReading*>(Sensor::reading()); |
| 39 } | 39 } |
| 40 | 40 |
| 41 bool Accelerometer::includesGravity() const { | 41 bool Accelerometer::includesGravity() const { |
| 42 return m_accelerometerOptions.includeGravity(); | 42 return m_accelerometerOptions.includeGravity(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 std::unique_ptr<SensorReadingFactory> | 45 std::unique_ptr<SensorReadingFactory> |
| 46 Accelerometer::createSensorReadingFactory() { | 46 Accelerometer::createSensorReadingFactory() { |
| 47 return std::unique_ptr<SensorReadingFactory>( | 47 return std::unique_ptr<SensorReadingFactory>( |
| 48 new SensorReadingFactoryImpl<AccelerometerReading>()); | 48 new SensorReadingFactoryImpl<AccelerometerReading>()); |
| 49 } | 49 } |
| 50 | 50 |
| 51 DEFINE_TRACE(Accelerometer) { | 51 DEFINE_TRACE(Accelerometer) { |
| 52 Sensor::trace(visitor); | 52 Sensor::trace(visitor); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace blink | 55 } // namespace blink |
| OLD | NEW |