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

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

Issue 2763333002: Convert device sensors structs from Blink to Chromium naming (Closed)
Patch Set: Rebase Created 3 years, 9 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
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 : nullptr, 121 : nullptr,
122 init.hasRotationRate() 122 init.hasRotationRate()
123 ? DeviceMotionData::RotationRate::create(init.rotationRate()) 123 ? DeviceMotionData::RotationRate::create(init.rotationRate())
124 : nullptr, 124 : nullptr,
125 init.hasInterval() ? init.interval() : 0); 125 init.hasInterval() ? init.interval() : 0);
126 } 126 }
127 127
128 DeviceMotionData* DeviceMotionData::create(const device::MotionData& data) { 128 DeviceMotionData* DeviceMotionData::create(const device::MotionData& data) {
129 return DeviceMotionData::create( 129 return DeviceMotionData::create(
130 DeviceMotionData::Acceleration::create( 130 DeviceMotionData::Acceleration::create(
131 data.hasAccelerationX, data.accelerationX, data.hasAccelerationY, 131 data.has_acceleration_x, data.acceleration_x, data.has_acceleration_y,
132 data.accelerationY, data.hasAccelerationZ, data.accelerationZ), 132 data.acceleration_y, data.has_acceleration_z, data.acceleration_z),
133 DeviceMotionData::Acceleration::create( 133 DeviceMotionData::Acceleration::create(
134 data.hasAccelerationIncludingGravityX, 134 data.has_acceleration_including_gravity_x,
135 data.accelerationIncludingGravityX, 135 data.acceleration_including_gravity_x,
136 data.hasAccelerationIncludingGravityY, 136 data.has_acceleration_including_gravity_y,
137 data.accelerationIncludingGravityY, 137 data.acceleration_including_gravity_y,
138 data.hasAccelerationIncludingGravityZ, 138 data.has_acceleration_including_gravity_z,
139 data.accelerationIncludingGravityZ), 139 data.acceleration_including_gravity_z),
140 DeviceMotionData::RotationRate::create( 140 DeviceMotionData::RotationRate::create(
141 data.hasRotationRateAlpha, data.rotationRateAlpha, 141 data.has_rotation_rate_alpha, data.rotation_rate_alpha,
142 data.hasRotationRateBeta, data.rotationRateBeta, 142 data.has_rotation_rate_beta, data.rotation_rate_beta,
143 data.hasRotationRateGamma, data.rotationRateGamma), 143 data.has_rotation_rate_gamma, data.rotation_rate_gamma),
144 data.interval); 144 data.interval);
145 } 145 }
146 146
147 DeviceMotionData::DeviceMotionData() : m_interval(0) {} 147 DeviceMotionData::DeviceMotionData() : m_interval(0) {}
148 148
149 DeviceMotionData::DeviceMotionData(Acceleration* acceleration, 149 DeviceMotionData::DeviceMotionData(Acceleration* acceleration,
150 Acceleration* accelerationIncludingGravity, 150 Acceleration* accelerationIncludingGravity,
151 RotationRate* rotationRate, 151 RotationRate* rotationRate,
152 double interval) 152 double interval)
153 : m_acceleration(acceleration), 153 : m_acceleration(acceleration),
(...skipping 19 matching lines...) Expand all
173 m_accelerationIncludingGravity->canProvideZ()); 173 m_accelerationIncludingGravity->canProvideZ());
174 const bool hasRotationRate = 174 const bool hasRotationRate =
175 m_rotationRate && 175 m_rotationRate &&
176 (m_rotationRate->canProvideAlpha() || m_rotationRate->canProvideBeta() || 176 (m_rotationRate->canProvideAlpha() || m_rotationRate->canProvideBeta() ||
177 m_rotationRate->canProvideGamma()); 177 m_rotationRate->canProvideGamma());
178 178
179 return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate; 179 return hasAcceleration || hasAccelerationIncludingGravity || hasRotationRate;
180 } 180 }
181 181
182 } // namespace blink 182 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698