Bug 1007349 - Fix invalid timestamp in orientation angle calculation. r=mwu

widget/gonk/ProcessOrientation.cpp

@@ -181,8 +181,8 @@ ProcessOrientation::OnSensorChanged(const SensorData& event,
   // Reset the orientation listener state if the samples are too far apart in
   // time or when we see values of (0, 0, 0) which indicates that we polled the
   // accelerometer too soon after turning it on and we don't have any data yet.
-  const long now = event.timestamp();
-  const long then = mLastFilteredTimestampNanos;
+  const int64_t now = (int64_t) event.timestamp();
+  const int64_t then = mLastFilteredTimestampNanos;
   const float timeDeltaMS = (now - then) * 0.000001f;
   bool skipSample = false;
   if (now < then
@@ -388,7 +388,7 @@ ProcessOrientation::IsOrientationAngleAcceptable(int rotation,
 }
 
 bool
-ProcessOrientation::IsPredictedRotationAcceptable(long now)
+ProcessOrientation::IsPredictedRotationAcceptable(int64_t now)
 {
   // The predicted rotation must have settled long enough.
   if (now < mPredictedRotationTimestampNanos + PROPOSAL_SETTLE_TIME_NANOS) {
@@ -416,11 +416,11 @@ ProcessOrientation::IsPredictedRotationAcceptable(long now)
 int
 ProcessOrientation::Reset()
 {
-  mLastFilteredTimestampNanos = LONG_MIN;
+  mLastFilteredTimestampNanos = std::numeric_limits<int64_t>::min();
   mProposedRotation = -1;
-  mFlatTimestampNanos = LONG_MIN;
-  mSwingTimestampNanos = LONG_MIN;
-  mAccelerationTimestampNanos = LONG_MIN;
+  mFlatTimestampNanos = std::numeric_limits<int64_t>::min();
+  mSwingTimestampNanos = std::numeric_limits<int64_t>::min();
+  mAccelerationTimestampNanos = std::numeric_limits<int64_t>::min();
   ClearPredictedRotation();
   ClearTiltHistory();
   return -1;
@@ -430,11 +430,11 @@ void
 ProcessOrientation::ClearPredictedRotation()
 {
   mPredictedRotation = -1;
-  mPredictedRotationTimestampNanos = LONG_MIN;
+  mPredictedRotationTimestampNanos = std::numeric_limits<int64_t>::min();
 }
 
 void
-ProcessOrientation::UpdatePredictedRotation(long now, int rotation)
+ProcessOrientation::UpdatePredictedRotation(int64_t now, int rotation)
 {
   if (mPredictedRotation != rotation) {
     mPredictedRotation = rotation;
@@ -452,21 +452,21 @@ ProcessOrientation::IsAccelerating(float magnitude)
 void
 ProcessOrientation::ClearTiltHistory()
 {
-  mTiltHistory.history[0].timestampNanos = LONG_MIN;
+  mTiltHistory.history[0].timestampNanos = std::numeric_limits<int64_t>::min();
   mTiltHistory.index = 1;
 }
 
 void
-ProcessOrientation::AddTiltHistoryEntry(long now, float tilt)
+ProcessOrientation::AddTiltHistoryEntry(int64_t now, float tilt)
 {
   mTiltHistory.history[mTiltHistory.index].tiltAngle = tilt;
   mTiltHistory.history[mTiltHistory.index].timestampNanos = now;
   mTiltHistory.index = (mTiltHistory.index + 1) % TILT_HISTORY_SIZE;
-  mTiltHistory.history[mTiltHistory.index].timestampNanos = LONG_MIN;
+  mTiltHistory.history[mTiltHistory.index].timestampNanos = std::numeric_limits<int64_t>::min();
 }
 
 bool
-ProcessOrientation::IsFlat(long now)
+ProcessOrientation::IsFlat(int64_t now)
 {
   for (int i = mTiltHistory.index; (i = NextTiltHistoryIndex(i)) >= 0;) {
     if (mTiltHistory.history[i].tiltAngle < FLAT_ANGLE) {
@@ -481,7 +481,7 @@ ProcessOrientation::IsFlat(long now)
 }
 
 bool
-ProcessOrientation::IsSwinging(long now, float tilt)
+ProcessOrientation::IsSwinging(int64_t now, float tilt)
 {
   for (int i = mTiltHistory.index; (i = NextTiltHistoryIndex(i)) >= 0;) {
     if (mTiltHistory.history[i].timestampNanos + SWING_TIME_NANOS < now) {
@@ -499,11 +499,11 @@ int
 ProcessOrientation::NextTiltHistoryIndex(int index)
 {
   index = (index == 0 ? TILT_HISTORY_SIZE : index) - 1;
-  return mTiltHistory.history[index].timestampNanos != LONG_MIN ? index : -1;
+  return mTiltHistory.history[index].timestampNanos != std::numeric_limits<int64_t>::min() ? index : -1;
 }
 
 float
-ProcessOrientation::RemainingMS(long now, long until)
+ProcessOrientation::RemainingMS(int64_t now, int64_t until)
 {
   return now >= until ? 0 : (until - now) * 0.000001f;
 }

widget/gonk/ProcessOrientation.h

@@ -49,17 +49,17 @@ private:
 
   // Returns true if the predicted rotation is ready to be advertised as a
   // proposed rotation.
-  bool IsPredictedRotationAcceptable(long now);
+  bool IsPredictedRotationAcceptable(int64_t now);
 
   void ClearPredictedRotation();
-  void UpdatePredictedRotation(long now, int rotation);
+  void UpdatePredictedRotation(int64_t now, int rotation);
   bool IsAccelerating(float magnitude);
   void ClearTiltHistory();
-  void AddTiltHistoryEntry(long now, float tilt);
-  bool IsFlat(long now);
-  bool IsSwinging(long now, float tilt);
+  void AddTiltHistoryEntry(int64_t now, float tilt);
+  bool IsFlat(int64_t now);
+  bool IsSwinging(int64_t now, float tilt);
   int NextTiltHistoryIndex(int index);
-  float RemainingMS(long now, long until);
+  float RemainingMS(int64_t now, int64_t until);
 
   // The tilt angle range in degrees for each orientation. Beyond these tilt
   // angles, we don't even consider transitioning into the specified orientation.
@@ -74,7 +74,7 @@ private:
   static const int tiltTolerance[][4];
 
   // Timestamp and value of the last accelerometer sample.
-  long mLastFilteredTimestampNanos;
+  int64_t mLastFilteredTimestampNanos;
   float mLastFilteredX, mLastFilteredY, mLastFilteredZ;
 
   // The last proposed rotation, -1 if unknown.
@@ -84,23 +84,23 @@ private:
   int mPredictedRotation;
 
   // Timestamp of when the predicted rotation most recently changed.
-  long mPredictedRotationTimestampNanos;
+  int64_t mPredictedRotationTimestampNanos;
 
   // Timestamp when the device last appeared to be flat for sure (the flat delay
   // elapsed).
-  long mFlatTimestampNanos;
+  int64_t mFlatTimestampNanos;
 
   // Timestamp when the device last appeared to be swinging.
-  long mSwingTimestampNanos;
+  int64_t mSwingTimestampNanos;
 
   // Timestamp when the device last appeared to be undergoing external
   // acceleration.
-  long mAccelerationTimestampNanos;
+  int64_t mAccelerationTimestampNanos;
 
   struct {
     struct {
       float tiltAngle;
-      long timestampNanos;
+      int64_t timestampNanos;
     } history[TILT_HISTORY_SIZE];
     int index;
   } mTiltHistory;