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 "config.h" | 26 #include "config.h" |
27 #include "modules/device_orientation/DeviceMotionData.h" | 27 #include "modules/device_orientation/DeviceMotionData.h" |
| 28 #include <public/WebDeviceMotionData.h> |
28 | 29 |
29 namespace WebCore { | 30 namespace WebCore { |
30 | 31 |
31 PassRefPtr<DeviceMotionData::Acceleration> DeviceMotionData::Acceleration::creat
e(bool canProvideX, double x, | 32 PassRefPtr<DeviceMotionData::Acceleration> DeviceMotionData::Acceleration::creat
e(bool canProvideX, double x, |
32
bool canProvideY, double y, | 33
bool canProvideY, double y, |
33
bool canProvideZ, double z) | 34
bool canProvideZ, double z) |
34 { | 35 { |
35 return adoptRef(new DeviceMotionData::Acceleration(canProvideX, x, canProvid
eY, y, canProvideZ, z)); | 36 return adoptRef(new DeviceMotionData::Acceleration(canProvideX, x, canProvid
eY, y, canProvideZ, z)); |
36 } | 37 } |
37 | 38 |
(...skipping 29 matching lines...) Expand all Loading... |
67 { | 68 { |
68 return adoptRef(new DeviceMotionData); | 69 return adoptRef(new DeviceMotionData); |
69 } | 70 } |
70 | 71 |
71 PassRefPtr<DeviceMotionData> DeviceMotionData::create(PassRefPtr<Acceleration> a
cceleration, PassRefPtr<Acceleration> accelerationIncludingGravity, | 72 PassRefPtr<DeviceMotionData> DeviceMotionData::create(PassRefPtr<Acceleration> a
cceleration, PassRefPtr<Acceleration> accelerationIncludingGravity, |
72 PassRefPtr<RotationRate> r
otationRate, bool canProvideInterval, double interval) | 73 PassRefPtr<RotationRate> r
otationRate, bool canProvideInterval, double interval) |
73 { | 74 { |
74 return adoptRef(new DeviceMotionData(acceleration, accelerationIncludingGrav
ity, rotationRate, canProvideInterval, interval)); | 75 return adoptRef(new DeviceMotionData(acceleration, accelerationIncludingGrav
ity, rotationRate, canProvideInterval, interval)); |
75 } | 76 } |
76 | 77 |
| 78 PassRefPtr<DeviceMotionData> DeviceMotionData::create(const WebKit::WebDeviceMot
ionData& data) |
| 79 { |
| 80 return DeviceMotionData::create( |
| 81 DeviceMotionData::Acceleration::create( |
| 82 data.hasAccelerationX, data.accelerationX, |
| 83 data.hasAccelerationY, data.accelerationY, |
| 84 data.hasAccelerationZ, data.accelerationZ), |
| 85 DeviceMotionData::Acceleration::create( |
| 86 data.hasAccelerationIncludingGravityX, data.accelerationIncludingGra
vityX, |
| 87 data.hasAccelerationIncludingGravityY, data.accelerationIncludingGra
vityY, |
| 88 data.hasAccelerationIncludingGravityZ, data.accelerationIncludingGra
vityZ), |
| 89 DeviceMotionData::RotationRate::create( |
| 90 data.hasRotationRateAlpha, data.rotationRateAlpha, |
| 91 data.hasRotationRateBeta, data.rotationRateBeta, |
| 92 data.hasRotationRateGamma, data.rotationRateGamma), |
| 93 true, data.interval); |
| 94 } |
| 95 |
77 DeviceMotionData::DeviceMotionData() | 96 DeviceMotionData::DeviceMotionData() |
78 : m_canProvideInterval(false) | 97 : m_canProvideInterval(false) |
79 , m_interval(0) | 98 , m_interval(0) |
80 { | 99 { |
81 } | 100 } |
82 | 101 |
83 DeviceMotionData::DeviceMotionData(PassRefPtr<Acceleration> acceleration, PassRe
fPtr<Acceleration> accelerationIncludingGravity, | 102 DeviceMotionData::DeviceMotionData(PassRefPtr<Acceleration> acceleration, PassRe
fPtr<Acceleration> accelerationIncludingGravity, |
84 PassRefPtr<RotationRate> rotationRate, bool c
anProvideInterval, double interval) | 103 PassRefPtr<RotationRate> rotationRate, bool c
anProvideInterval, double interval) |
85 : m_acceleration(acceleration) | 104 : m_acceleration(acceleration) |
86 , m_accelerationIncludingGravity(accelerationIncludingGravity) | 105 , m_accelerationIncludingGravity(accelerationIncludingGravity) |
87 , m_rotationRate(rotationRate) | 106 , m_rotationRate(rotationRate) |
88 , m_canProvideInterval(canProvideInterval) | 107 , m_canProvideInterval(canProvideInterval) |
89 , m_interval(interval) | 108 , m_interval(interval) |
90 { | 109 { |
91 } | 110 } |
92 | 111 |
93 } // namespace WebCore | 112 } // namespace WebCore |
OLD | NEW |