Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1095867 - Fix nsDeviceSensors.cpp typo and remove obsolete comment. r=dougt

Browse Source
This commit is contained in:
Chris Peterson 2014-11-07 20:48:38 -08:00
parent 74a96a4348
commit 4123fe1631
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/system/nsDeviceSensors.cpp
View File

@ -29,7 +29,6 @@ using namespace hal;
#undef near
// also see sDefaultSensorHint in mobile/android/base/GeckoAppShell.java
#define DEFAULT_SENSOR_POLL 100
static const nsTArray<nsIDOMWindow*>::index_type NoIndex =
@ -114,7 +113,7 @@ nsDeviceSensors::nsDeviceSensors()
nsDeviceSensors::~nsDeviceSensors()
{
for (int i = 0; i < NUM_SENSOR_TYPE; i++) {
if (IsSensorEnabled(i))
if (IsSensorEnabled(i))
UnregisterSensorObserver((SensorType)i, this);
}
@ -351,12 +350,12 @@ nsDeviceSensors::FireDOMMotionEvent(nsIDOMDocument *domdoc,
mLastAcceleration->mZ.SetValue(z);
break;
case nsIDeviceSensorData::TYPE_ACCELERATION:
if (!mLastAccelerationIncluduingGravity) {
mLastAccelerationIncluduingGravity.emplace();
if (!mLastAccelerationIncludingGravity) {
mLastAccelerationIncludingGravity.emplace();
}
mLastAccelerationIncluduingGravity->mX.SetValue(x);
mLastAccelerationIncluduingGravity->mY.SetValue(y);
mLastAccelerationIncluduingGravity->mZ.SetValue(z);
mLastAccelerationIncludingGravity->mX.SetValue(x);
mLastAccelerationIncludingGravity->mY.SetValue(y);
mLastAccelerationIncludingGravity->mZ.SetValue(z);
break;
case nsIDeviceSensorData::TYPE_GYROSCOPE:
if (!mLastRotationRate) {
@ -372,14 +371,14 @@ nsDeviceSensors::FireDOMMotionEvent(nsIDOMDocument *domdoc,
if (!mLastAcceleration) {
mLastAcceleration.emplace();
}
if (!mLastAccelerationIncluduingGravity) {
mLastAccelerationIncluduingGravity.emplace();
if (!mLastAccelerationIncludingGravity) {
mLastAccelerationIncludingGravity.emplace();
}
if (!mLastRotationRate) {
mLastRotationRate.emplace();
}
} else if (!mLastAcceleration ||
!mLastAccelerationIncluduingGravity ||
!mLastAccelerationIncludingGravity ||
!mLastRotationRate) {
return;
}
@ -394,7 +393,7 @@ nsDeviceSensors::FireDOMMotionEvent(nsIDOMDocument *domdoc,
true,
false,
*mLastAcceleration,
*mLastAccelerationIncluduingGravity,
*mLastAccelerationIncludingGravity,
*mLastRotationRate,
Nullable<double>(DEFAULT_SENSOR_POLL),
rv);
@ -405,7 +404,7 @@ nsDeviceSensors::FireDOMMotionEvent(nsIDOMDocument *domdoc,
target->DispatchEvent(event, &defaultActionEnabled);
mLastRotationRate.reset();
mLastAccelerationIncluduingGravity.reset();
mLastAccelerationIncludingGravity.reset();
mLastAcceleration.reset();
mLastDOMMotionEventTime = TimeStamp::Now();
}

2
dom/system/nsDeviceSensors.h
View File

@ -73,7 +73,7 @@ private:
mozilla::TimeStamp mLastDOMMotionEventTime;
bool mIsUserProximityNear;
mozilla::Maybe<DeviceAccelerationInit> mLastAcceleration;
mozilla::Maybe<DeviceAccelerationInit> mLastAccelerationIncluduingGravity;
mozilla::Maybe<DeviceAccelerationInit> mLastAccelerationIncludingGravity;
mozilla::Maybe<DeviceRotationRateInit> mLastRotationRate;
};