OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * * Redistributions of source code must retain the above copyright | 7 * * Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * * Redistributions in binary form must reproduce the above copyright | 9 * * Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "modules/device_orientation/DeviceMotionData.h" | 26 #include "modules/device_orientation/DeviceMotionData.h" |
27 | 27 |
| 28 #include "device/sensors/public/cpp/motion_data.h" |
28 #include "modules/device_orientation/DeviceAccelerationInit.h" | 29 #include "modules/device_orientation/DeviceAccelerationInit.h" |
29 #include "modules/device_orientation/DeviceMotionEventInit.h" | 30 #include "modules/device_orientation/DeviceMotionEventInit.h" |
30 #include "modules/device_orientation/DeviceRotationRateInit.h" | 31 #include "modules/device_orientation/DeviceRotationRateInit.h" |
31 #include "public/platform/modules/device_orientation/WebDeviceMotionData.h" | |
32 | 32 |
33 namespace blink { | 33 namespace blink { |
34 | 34 |
35 DeviceMotionData::Acceleration* DeviceMotionData::Acceleration::create( | 35 DeviceMotionData::Acceleration* DeviceMotionData::Acceleration::create( |
36 bool canProvideX, | 36 bool canProvideX, |
37 double x, | 37 double x, |
38 bool canProvideY, | 38 bool canProvideY, |
39 double y, | 39 double y, |
40 bool canProvideZ, | 40 bool canProvideZ, |
41 double z) { | 41 double z) { |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 init.hasAccelerationIncludingGravity() | 119 init.hasAccelerationIncludingGravity() |
120 ? DeviceMotionData::Acceleration::create( | 120 ? DeviceMotionData::Acceleration::create( |
121 init.accelerationIncludingGravity()) | 121 init.accelerationIncludingGravity()) |
122 : nullptr, | 122 : nullptr, |
123 init.hasRotationRate() | 123 init.hasRotationRate() |
124 ? DeviceMotionData::RotationRate::create(init.rotationRate()) | 124 ? DeviceMotionData::RotationRate::create(init.rotationRate()) |
125 : nullptr, | 125 : nullptr, |
126 init.hasInterval(), init.hasInterval() ? init.interval() : 0); | 126 init.hasInterval(), init.hasInterval() ? init.interval() : 0); |
127 } | 127 } |
128 | 128 |
129 DeviceMotionData* DeviceMotionData::create(const WebDeviceMotionData& data) { | 129 DeviceMotionData* DeviceMotionData::create(const device::MotionData& data) { |
130 return DeviceMotionData::create( | 130 return DeviceMotionData::create( |
131 DeviceMotionData::Acceleration::create( | 131 DeviceMotionData::Acceleration::create( |
132 data.hasAccelerationX, data.accelerationX, data.hasAccelerationY, | 132 data.hasAccelerationX, data.accelerationX, data.hasAccelerationY, |
133 data.accelerationY, data.hasAccelerationZ, data.accelerationZ), | 133 data.accelerationY, data.hasAccelerationZ, data.accelerationZ), |
134 DeviceMotionData::Acceleration::create( | 134 DeviceMotionData::Acceleration::create( |
135 data.hasAccelerationIncludingGravityX, | 135 data.hasAccelerationIncludingGravityX, |
136 data.accelerationIncludingGravityX, | 136 data.accelerationIncludingGravityX, |
137 data.hasAccelerationIncludingGravityY, | 137 data.hasAccelerationIncludingGravityY, |
138 data.accelerationIncludingGravityY, | 138 data.accelerationIncludingGravityY, |
139 data.hasAccelerationIncludingGravityZ, | 139 data.hasAccelerationIncludingGravityZ, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 m_accelerationIncludingGravity->canProvideZ()); | 177 m_accelerationIncludingGravity->canProvideZ()); |
178 const bool hasRotationRate = | 178 const bool hasRotationRate = |
179 m_rotationRate && | 179 m_rotationRate && |
180 (m_rotationRate->canProvideAlpha() || m_rotationRate->canProvideBeta() || | 180 (m_rotationRate->canProvideAlpha() || m_rotationRate->canProvideBeta() || |
181 m_rotationRate->canProvideGamma()); | 181 m_rotationRate->canProvideGamma()); |
182 | 182 |
183 return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate; | 183 return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate; |
184 } | 184 } |
185 | 185 |
186 } // namespace blink | 186 } // namespace blink |
OLD | NEW |