Defer synthetic gesture completions until events have been flushed

content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
@@ skipping 367 matching lines @@
   }
 
   void QueueSyntheticGesture(scoped_ptr<SyntheticGesture> gesture) {
     controller_->QueueSyntheticGesture(gesture.Pass(),
         base::Bind(&SyntheticGestureControllerTest::OnSyntheticGestureCompleted,
             base::Unretained(this)));
   }
 
   void FlushInputUntilComplete() {
     while (target_->flush_requested()) {
-      target_->ClearFlushRequest();
-      time_ += base::TimeDelta::FromMilliseconds(kFlushInputRateInMs);
-      controller_->Flush(time_);
+      while (target_->flush_requested()) {
+        target_->ClearFlushRequest();
+        time_ += base::TimeDelta::FromMilliseconds(kFlushInputRateInMs);
+        controller_->Flush(time_);
+      }
+      controller_->OnDidFlushInput();
     }
   }
 
   void OnSyntheticGestureCompleted(SyntheticGesture::Result result) {
     DCHECK_NE(result, SyntheticGesture::GESTURE_RUNNING);
     if (result == SyntheticGesture::GESTURE_FINISHED)
       num_success_++;
     else
       num_failure_++;
   }
@@ skipping 75 matching lines @@
   QueueSyntheticGesture(gesture_2.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_TRUE(finished_1);
   EXPECT_TRUE(finished_2);
 
   EXPECT_EQ(2, num_success_);
   EXPECT_EQ(0, num_failure_);
 }
 
+TEST_F(SyntheticGestureControllerTest, GestureCompletedOnDidFlushInput) {
+  CreateControllerAndTarget<MockSyntheticGestureTarget>();
+
+  bool finished_1, finished_2;
+  scoped_ptr<MockSyntheticGesture> gesture_1(
+      new MockSyntheticGesture(&finished_1, 2));
+  scoped_ptr<MockSyntheticGesture> gesture_2(
+      new MockSyntheticGesture(&finished_2, 4));
+
+  QueueSyntheticGesture(gesture_1.PassAs<SyntheticGesture>());
+  QueueSyntheticGesture(gesture_2.PassAs<SyntheticGesture>());
+
+  while (target_->flush_requested()) {
+    target_->ClearFlushRequest();
+    time_ += base::TimeDelta::FromMilliseconds(kFlushInputRateInMs);
+    controller_->Flush(time_);
+  }
+  EXPECT_EQ(0, num_success_);
+  controller_->OnDidFlushInput();
+  EXPECT_EQ(1, num_success_);
+
+  while (target_->flush_requested()) {
+    target_->ClearFlushRequest();
+    time_ += base::TimeDelta::FromMilliseconds(kFlushInputRateInMs);
+    controller_->Flush(time_);
+  }
+  EXPECT_EQ(1, num_success_);
+  controller_->OnDidFlushInput();
+  EXPECT_EQ(2, num_success_);
+}
+
 gfx::Vector2d AddTouchSlopToVector(const gfx::Vector2d& vector,
                                    SyntheticGestureTarget* target) {
   const int kTouchSlop = target->GetTouchSlopInDips();
 
   int x = vector.x();
   if (x > 0)
     x += kTouchSlop;
   else if (x < 0)
     x -= kTouchSlop;
 
@@ skipping 462 matching lines @@
   EXPECT_TRUE(tap_target->GestureFinished());
   EXPECT_EQ(tap_target->position(), params.position);
   EXPECT_EQ(tap_target->GetDuration().InMilliseconds(), params.duration_ms);
   EXPECT_GE(GetTotalTime(),
             base::TimeDelta::FromMilliseconds(params.duration_ms));
 }
 
 }  // namespace
 
 }  // namespace content