Merge lp:~chasedouglas/grail/atomic-timeout-fix into lp:grail

[Chase Douglas]

Fix atomic timeout calculation.

[Daniel d'Andrada (dandrader)]

Looks ok.

review: Approve

=== modified file 'src/v3/atomic-recognizer.cpp'
--- src/v3/atomic-recognizer.cpp	2012-03-14 20:12:00 +0000
+++ src/v3/atomic-recognizer.cpp	2012-03-16 23:31:19 +0000
@@ -70,6 +70,11 @@
   FindGestureToAccept(event_time);
 }
 
+void AtomicRecognizer::UpdateTime(uint64_t time) {
+  Recognizer::UpdateTime(time);
+  FindGestureToAccept(time);
+}
+
 /**
  * @internal
  * Perform tasks necessary for when new touches occur and there is an existing
@@ -304,5 +309,22 @@
   }
 }
 
+uint64_t AtomicRecognizer::NextTimeout() {
+  uint64_t timeout = Recognizer::NextTimeout();
+
+  /* Check for any active gestures that are kept back due to waiting for the
+   * composition time to pass before flushing the queue */
+  for (const SharedGesture& gesture : unaccepted_gestures_) {
+    if (!gesture->IsActive())
+      continue;
+
+    uint64_t new_timeout = gesture->start_time() + kCompositionTime;
+    if (new_timeout < timeout)
+      timeout = new_timeout;
+  }
+
+  return timeout;
+}
+
 } // namespace grail
 } // namespace utouch

=== modified file 'src/v3/atomic-recognizer.h'
--- src/v3/atomic-recognizer.h	2012-03-14 20:12:00 +0000
+++ src/v3/atomic-recognizer.h	2012-03-16 23:31:19 +0000
@@ -33,6 +33,7 @@
 
   virtual bool atomic() const {return true;}
   virtual void ProcessFrameEvent(const UFEvent event);
+  virtual void UpdateTime(uint64_t time);
 
  private:
   void HandleNewTouchesForAcceptedGesture(const SharedGesture& gesture);
@@ -41,6 +42,7 @@
   void MatchSubscriptionsForNewTouches();
   void MatchGestures();
   void FindGestureToAccept(uint64_t event_time);
+  virtual uint64_t NextTimeout();
 
   /* Touches that have begun but not yet been matched against subscriptions
      (for the creation of new gestures) or used to update existing gestures. */

=== modified file 'src/v3/recognizer.h'
--- src/v3/recognizer.h	2012-03-14 20:12:00 +0000
+++ src/v3/recognizer.h	2012-03-16 23:31:19 +0000
@@ -71,8 +71,8 @@
 
   UGStatus ActivateSubscription(UGSubscription* subscription);
   void DeactivateSubscription(UGSubscription* subscription);
-  void UpdateTime(uint64_t time);
-  uint64_t NextTimeout();
+  virtual void UpdateTime(uint64_t time);
+  virtual uint64_t NextTimeout();
   UGStatus AcceptGesture(unsigned int id);
   UGStatus RejectGesture(unsigned int id);