Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp

Issue 2896583005: Reland: Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors (Closed)
Patch Set: updated test code Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
29 #include "modules/device_orientation/DeviceAccelerationInit.h" 28 #include "modules/device_orientation/DeviceAccelerationInit.h"
30 #include "modules/device_orientation/DeviceMotionEventInit.h" 29 #include "modules/device_orientation/DeviceMotionEventInit.h"
31 #include "modules/device_orientation/DeviceRotationRateInit.h" 30 #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 can_provide_x, 36 bool can_provide_x,
37 double x, 37 double x,
38 bool can_provide_y, 38 bool can_provide_y,
39 double y, 39 double y,
40 bool can_provide_z, 40 bool can_provide_z,
41 double z) { 41 double z) {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
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.interval()); 126 init.interval());
127 } 127 }
128 128
129 DeviceMotionData* DeviceMotionData::Create(const device::MotionData& data) { 129 DeviceMotionData* DeviceMotionData::Create(const WebDeviceMotionData& data) {
130 return DeviceMotionData::Create( 130 return DeviceMotionData::Create(
131 DeviceMotionData::Acceleration::Create( 131 DeviceMotionData::Acceleration::Create(
132 data.has_acceleration_x, data.acceleration_x, data.has_acceleration_y, 132 data.has_acceleration_x, data.acceleration_x, data.has_acceleration_y,
133 data.acceleration_y, data.has_acceleration_z, data.acceleration_z), 133 data.acceleration_y, data.has_acceleration_z, data.acceleration_z),
134 DeviceMotionData::Acceleration::Create( 134 DeviceMotionData::Acceleration::Create(
135 data.has_acceleration_including_gravity_x, 135 data.has_acceleration_including_gravity_x,
136 data.acceleration_including_gravity_x, 136 data.acceleration_including_gravity_x,
137 data.has_acceleration_including_gravity_y, 137 data.has_acceleration_including_gravity_y,
138 data.acceleration_including_gravity_y, 138 data.acceleration_including_gravity_y,
139 data.has_acceleration_including_gravity_z, 139 data.has_acceleration_including_gravity_z,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 const bool has_rotation_rate = 175 const bool has_rotation_rate =
176 rotation_rate_ && 176 rotation_rate_ &&
177 (rotation_rate_->CanProvideAlpha() || rotation_rate_->CanProvideBeta() || 177 (rotation_rate_->CanProvideAlpha() || rotation_rate_->CanProvideBeta() ||
178 rotation_rate_->CanProvideGamma()); 178 rotation_rate_->CanProvideGamma());
179 179
180 return has_acceleration || has_acceleration_including_gravity || 180 return has_acceleration || has_acceleration_including_gravity ||
181 has_rotation_rate; 181 has_rotation_rate;
182 } 182 }
183 183
184 } // namespace blink 184 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698