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 #include "public/platform/modules/device_orientation/WebDeviceMotionData.h" | 27 |
| 28 #include "device/sensors/public/cpp/motion_data.h" |
28 | 29 |
29 namespace blink { | 30 namespace blink { |
30 | 31 |
31 DeviceMotionData::Acceleration* DeviceMotionData::Acceleration::create( | 32 DeviceMotionData::Acceleration* DeviceMotionData::Acceleration::create( |
32 bool canProvideX, | 33 bool canProvideX, |
33 double x, | 34 double x, |
34 bool canProvideY, | 35 bool canProvideY, |
35 double y, | 36 double y, |
36 bool canProvideZ, | 37 bool canProvideZ, |
37 double z) { | 38 double z) { |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 DeviceMotionData* DeviceMotionData::create( | 86 DeviceMotionData* DeviceMotionData::create( |
86 Acceleration* acceleration, | 87 Acceleration* acceleration, |
87 Acceleration* accelerationIncludingGravity, | 88 Acceleration* accelerationIncludingGravity, |
88 RotationRate* rotationRate, | 89 RotationRate* rotationRate, |
89 bool canProvideInterval, | 90 bool canProvideInterval, |
90 double interval) { | 91 double interval) { |
91 return new DeviceMotionData(acceleration, accelerationIncludingGravity, | 92 return new DeviceMotionData(acceleration, accelerationIncludingGravity, |
92 rotationRate, canProvideInterval, interval); | 93 rotationRate, canProvideInterval, interval); |
93 } | 94 } |
94 | 95 |
95 DeviceMotionData* DeviceMotionData::create(const WebDeviceMotionData& data) { | 96 DeviceMotionData* DeviceMotionData::create(const device::MotionData& data) { |
96 return DeviceMotionData::create( | 97 return DeviceMotionData::create( |
97 DeviceMotionData::Acceleration::create( | 98 DeviceMotionData::Acceleration::create( |
98 data.hasAccelerationX, data.accelerationX, data.hasAccelerationY, | 99 data.hasAccelerationX, data.accelerationX, data.hasAccelerationY, |
99 data.accelerationY, data.hasAccelerationZ, data.accelerationZ), | 100 data.accelerationY, data.hasAccelerationZ, data.accelerationZ), |
100 DeviceMotionData::Acceleration::create( | 101 DeviceMotionData::Acceleration::create( |
101 data.hasAccelerationIncludingGravityX, | 102 data.hasAccelerationIncludingGravityX, |
102 data.accelerationIncludingGravityX, | 103 data.accelerationIncludingGravityX, |
103 data.hasAccelerationIncludingGravityY, | 104 data.hasAccelerationIncludingGravityY, |
104 data.accelerationIncludingGravityY, | 105 data.accelerationIncludingGravityY, |
105 data.hasAccelerationIncludingGravityZ, | 106 data.hasAccelerationIncludingGravityZ, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 m_accelerationIncludingGravity->canProvideZ()); | 144 m_accelerationIncludingGravity->canProvideZ()); |
144 const bool hasRotationRate = | 145 const bool hasRotationRate = |
145 m_rotationRate && | 146 m_rotationRate && |
146 (m_rotationRate->canProvideAlpha() || m_rotationRate->canProvideBeta() || | 147 (m_rotationRate->canProvideAlpha() || m_rotationRate->canProvideBeta() || |
147 m_rotationRate->canProvideGamma()); | 148 m_rotationRate->canProvideGamma()); |
148 | 149 |
149 return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate; | 150 return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate; |
150 } | 151 } |
151 | 152 |
152 } // namespace blink | 153 } // namespace blink |
OLD | NEW |