[Android] Provide unhandled tap event notifications

content/browser/web_contents/touch_editable_impl_aura_browsertest.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/touch_editable_impl_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/values.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view_aura.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/event_utils.h"
 
+using blink::WebInputEvent;
+
 namespace content {
 
 class TestTouchEditableImplAura : public TouchEditableImplAura {
  public:
   TestTouchEditableImplAura()
       : selection_changed_callback_arrived_(false),
         waiting_for_selection_changed_callback_(false),
-        gesture_ack_callback_arrived_(false),
-        waiting_for_gesture_ack_callback_(false) {}
+        waiting_for_gesture_ack_type_(WebInputEvent::Undefined),
+        last_gesture_ack_type_(WebInputEvent::Undefined) {}
 
   virtual void Reset() {
     selection_changed_callback_arrived_ = false;
     waiting_for_selection_changed_callback_ = false;
-    gesture_ack_callback_arrived_ = false;
-    waiting_for_gesture_ack_callback_ = false;
+    waiting_for_gesture_ack_type_ = WebInputEvent::Undefined;
+    last_gesture_ack_type_ = WebInputEvent::Undefined;
   }
 
   virtual void OnSelectionOrCursorChanged(const gfx::Rect& anchor,
                                           const gfx::Rect& focus) OVERRIDE {
     selection_changed_callback_arrived_ = true;
     TouchEditableImplAura::OnSelectionOrCursorChanged(anchor, focus);
     if (waiting_for_selection_changed_callback_)
       selection_changed_wait_run_loop_->Quit();
   }
 
   virtual void GestureEventAck(int gesture_event_type) OVERRIDE {
-    gesture_ack_callback_arrived_ = true;
+    last_gesture_ack_type_ =
+        static_cast<WebInputEvent::Type>(gesture_event_type);
     TouchEditableImplAura::GestureEventAck(gesture_event_type);
-    if (waiting_for_gesture_ack_callback_)
+    if (waiting_for_gesture_ack_type_ == gesture_event_type)
       gesture_ack_wait_run_loop_->Quit();
   }
 
   virtual void WaitForSelectionChangeCallback() {
     if (selection_changed_callback_arrived_)
       return;
     waiting_for_selection_changed_callback_ = true;
     selection_changed_wait_run_loop_.reset(new base::RunLoop());
     selection_changed_wait_run_loop_->Run();
   }
 
-  virtual void WaitForGestureAck() {
-    if (gesture_ack_callback_arrived_)
+  virtual void WaitForGestureAck(WebInputEvent::Type gesture_event_type) {
+    if (last_gesture_ack_type_ == gesture_event_type)
       return;
-    waiting_for_gesture_ack_callback_ = true;
+    waiting_for_gesture_ack_type_ = gesture_event_type;
     gesture_ack_wait_run_loop_.reset(new base::RunLoop());
     gesture_ack_wait_run_loop_->Run();
   }
 
  protected:
   virtual ~TestTouchEditableImplAura() {}
 
  private:
   bool selection_changed_callback_arrived_;
   bool waiting_for_selection_changed_callback_;
-  bool gesture_ack_callback_arrived_;
-  bool waiting_for_gesture_ack_callback_;
+  WebInputEvent::Type waiting_for_gesture_ack_type_;
+  WebInputEvent::Type last_gesture_ack_type_;
   scoped_ptr<base::RunLoop> selection_changed_wait_run_loop_;
   scoped_ptr<base::RunLoop> gesture_ack_wait_run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTouchEditableImplAura);
 };
 
 // This class ignores mouse-moved, mouse-entered and mouse-exited events
 // without passing them to TouchEditableImplAura. Normally, we should not
 // receive these events; but, sometimes we receive them which breaks the tests
 // and makes them flaky: crbug.com/276992.
@@ skipping 267 matching lines @@
   aura::test::EventGenerator generator(content->GetRootWindow(), content);
   gfx::Rect bounds = content->GetBoundsInRootWindow();
   EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva);
 
   ExecuteSyncJSFunction(main_frame, "focus_textfield()");
   touch_editable->WaitForSelectionChangeCallback();
 
   // Tap textfield
   touch_editable->Reset();
   generator.GestureTapAt(gfx::Point(bounds.x() + 50, bounds.y() + 40));
-  // Tap Down and Tap acks are sent synchronously.
+  // Tap Down acks are sent synchronously, while Tap acks are asynchronous.
+  touch_editable->WaitForGestureAck(WebInputEvent::GestureTap);
   touch_editable->WaitForSelectionChangeCallback();
   touch_editable->Reset();
 
   // Check if cursor handle is showing.
   EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, GetTextInputType(touch_editable));
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_cursor_position()");
   int cursor_pos = -1;
@@ skipping 11 matching lines @@
   value = content::ExecuteScriptAndGetValue(main_frame,
                                             "get_cursor_position()");
   int new_cursor_pos = -1;
   value->GetAsInteger(&new_cursor_pos);
   EXPECT_NE(-1, new_cursor_pos);
   // Cursor should have moved.
   EXPECT_NE(new_cursor_pos, cursor_pos);
 }
 
 }  // namespace content