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 | 27 |
| 28 #include "device/sensors/public/cpp/orientation_data.h" |
28 #include "modules/device_orientation/DeviceOrientationEventInit.h" | 29 #include "modules/device_orientation/DeviceOrientationEventInit.h" |
29 #include "public/platform/modules/device_orientation/WebDeviceOrientationData.h" | |
30 | 30 |
31 namespace blink { | 31 namespace blink { |
32 | 32 |
33 DeviceOrientationData* DeviceOrientationData::create() { | 33 DeviceOrientationData* DeviceOrientationData::create() { |
34 return new DeviceOrientationData; | 34 return new DeviceOrientationData; |
35 } | 35 } |
36 | 36 |
37 DeviceOrientationData* DeviceOrientationData::create( | 37 DeviceOrientationData* DeviceOrientationData::create( |
38 const Nullable<double>& alpha, | 38 const Nullable<double>& alpha, |
39 const Nullable<double>& beta, | 39 const Nullable<double>& beta, |
(...skipping 10 matching lines...) Expand all Loading... |
50 if (init.hasAlpha()) | 50 if (init.hasAlpha()) |
51 alpha = init.alpha(); | 51 alpha = init.alpha(); |
52 if (init.hasBeta()) | 52 if (init.hasBeta()) |
53 beta = init.beta(); | 53 beta = init.beta(); |
54 if (init.hasGamma()) | 54 if (init.hasGamma()) |
55 gamma = init.gamma(); | 55 gamma = init.gamma(); |
56 return DeviceOrientationData::create(alpha, beta, gamma, init.absolute()); | 56 return DeviceOrientationData::create(alpha, beta, gamma, init.absolute()); |
57 } | 57 } |
58 | 58 |
59 DeviceOrientationData* DeviceOrientationData::create( | 59 DeviceOrientationData* DeviceOrientationData::create( |
60 const WebDeviceOrientationData& data) { | 60 const device::OrientationData& data) { |
61 Nullable<double> alpha; | 61 Nullable<double> alpha; |
62 Nullable<double> beta; | 62 Nullable<double> beta; |
63 Nullable<double> gamma; | 63 Nullable<double> gamma; |
64 if (data.hasAlpha) | 64 if (data.hasAlpha) |
65 alpha = data.alpha; | 65 alpha = data.alpha; |
66 if (data.hasBeta) | 66 if (data.hasBeta) |
67 beta = data.beta; | 67 beta = data.beta; |
68 if (data.hasGamma) | 68 if (data.hasGamma) |
69 gamma = data.gamma; | 69 gamma = data.gamma; |
70 return DeviceOrientationData::create(alpha, beta, gamma, data.absolute); | 70 return DeviceOrientationData::create(alpha, beta, gamma, data.absolute); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 | 104 |
105 bool DeviceOrientationData::canProvideGamma() const { | 105 bool DeviceOrientationData::canProvideGamma() const { |
106 return !m_gamma.isNull(); | 106 return !m_gamma.isNull(); |
107 } | 107 } |
108 | 108 |
109 bool DeviceOrientationData::canProvideEventData() const { | 109 bool DeviceOrientationData::canProvideEventData() const { |
110 return canProvideAlpha() || canProvideBeta() || canProvideGamma(); | 110 return canProvideAlpha() || canProvideBeta() || canProvideGamma(); |
111 } | 111 } |
112 | 112 |
113 } // namespace blink | 113 } // namespace blink |
OLD | NEW |