Merge lp:~dandrader/grail/lp963379 into lp:grail

[Daniel d'Andrada]

If a frame event contains a touch whose start time is bigger than the event time, the atomic gestures recognizer will prematurely accept a pending gesture.

Make AtomicRecognizer::FindGestureToAccept handle negative time deltas.

A test for this minor bug would be too time consuming to be worthwhile.

[Chase Douglas (chasedouglas)]

The boolean && operator should be at the end of the previous line instead of the beginning of the next line.

Otherwise, looks good :).

review: Approve

[Daniel d'Andrada (dandrader)]

> The boolean && operator should be at the end of the previous line instead of
> the beginning of the next line.
>
> Otherwise, looks good :).

I did that on purpose, to emphasize the relationship between "delta_time > 0" and "(uint64_t)delta_time >= COMPOSITION_TIME"

=== modified file 'src/v3/atomic-recognizer.cpp'
--- src/v3/atomic-recognizer.cpp	2012-03-23 14:55:01 +0000
+++ src/v3/atomic-recognizer.cpp	2012-03-23 19:23:18 +0000
@@ -282,7 +282,7 @@
 
 void AtomicRecognizer::FindGestureToAccept(uint64_t event_time)
 {
-  uint64_t delta_time;
+  int64_t delta_time;
   for (auto it = unaccepted_gestures_.begin();
        it != unaccepted_gestures_.end();
        ) {
@@ -302,8 +302,8 @@
          4-touches' gesture and not the intermediates 2-touches and 3-touches
          gestures.
        */
-    if (gesture->IsActive() && delta_time > 0
-        && delta_time >= COMPOSITION_TIME) {
+    if (gesture->IsActive()
+        && delta_time > 0 && (uint64_t)delta_time >= COMPOSITION_TIME) {
 
       gesture->set_keep_slices(false);