OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google 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/DeviceOrientationData.h" | 26 #include "modules/device_orientation/DeviceOrientationData.h" |
27 #include "public/platform/modules/device_orientation/WebDeviceOrientationData.h" | 27 |
| 28 #include "device/sensors/public/cpp/orientation_data.h" |
28 | 29 |
29 namespace blink { | 30 namespace blink { |
30 | 31 |
31 DeviceOrientationData* DeviceOrientationData::create() { | 32 DeviceOrientationData* DeviceOrientationData::create() { |
32 return new DeviceOrientationData; | 33 return new DeviceOrientationData; |
33 } | 34 } |
34 | 35 |
35 DeviceOrientationData* DeviceOrientationData::create( | 36 DeviceOrientationData* DeviceOrientationData::create( |
36 const Nullable<double>& alpha, | 37 const Nullable<double>& alpha, |
37 const Nullable<double>& beta, | 38 const Nullable<double>& beta, |
38 const Nullable<double>& gamma, | 39 const Nullable<double>& gamma, |
39 bool absolute) { | 40 bool absolute) { |
40 return new DeviceOrientationData(alpha, beta, gamma, absolute); | 41 return new DeviceOrientationData(alpha, beta, gamma, absolute); |
41 } | 42 } |
42 | 43 |
43 DeviceOrientationData* DeviceOrientationData::create( | 44 DeviceOrientationData* DeviceOrientationData::create( |
44 const WebDeviceOrientationData& data) { | 45 const device::OrientationData& data) { |
45 Nullable<double> alpha; | 46 Nullable<double> alpha; |
46 Nullable<double> beta; | 47 Nullable<double> beta; |
47 Nullable<double> gamma; | 48 Nullable<double> gamma; |
48 if (data.hasAlpha) | 49 if (data.hasAlpha) |
49 alpha = data.alpha; | 50 alpha = data.alpha; |
50 if (data.hasBeta) | 51 if (data.hasBeta) |
51 beta = data.beta; | 52 beta = data.beta; |
52 if (data.hasGamma) | 53 if (data.hasGamma) |
53 gamma = data.gamma; | 54 gamma = data.gamma; |
54 return DeviceOrientationData::create(alpha, beta, gamma, data.absolute); | 55 return DeviceOrientationData::create(alpha, beta, gamma, data.absolute); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 | 89 |
89 bool DeviceOrientationData::canProvideGamma() const { | 90 bool DeviceOrientationData::canProvideGamma() const { |
90 return !m_gamma.isNull(); | 91 return !m_gamma.isNull(); |
91 } | 92 } |
92 | 93 |
93 bool DeviceOrientationData::canProvideEventData() const { | 94 bool DeviceOrientationData::canProvideEventData() const { |
94 return canProvideAlpha() || canProvideBeta() || canProvideGamma(); | 95 return canProvideAlpha() || canProvideBeta() || canProvideGamma(); |
95 } | 96 } |
96 | 97 |
97 } // namespace blink | 98 } // namespace blink |
OLD | NEW |