Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1640)

Unified Diff: content/browser/web_contents/touch_editable_impl_aura_browsertest.cc

Issue 218633008: [Android] Provide unhandled tap event notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really now Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
index 2a42dda5ccab1e2b6aab75e92cd4fafcf162063f..00b046bf243293ecf1f7cbc97619c461283bf1da 100644
--- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
+++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
@@ -11,6 +11,7 @@
#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/common/input/web_input_event_traits.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/content_switches.h"
@@ -324,9 +325,14 @@ class TouchEditableImplAuraTest : public ContentBrowserTest {
// Tap textfield
touch_editable->Reset();
generator.GestureTapAt(gfx::Point(bounds.x() + 50, bounds.y() + 40));
- // Tap Down and Tap acks are sent synchronously.
- touch_editable->WaitForSelectionChangeCallback();
- touch_editable->Reset();
+ if (WebInputEventTraits::IgnoresAckDisposition(
+ blink::WebInputEvent::GestureTap)) {
jdduke (slow) 2014/04/04 03:26:53 tdresser@: What am I missing here? Looks like thi
tdresser 2014/04/04 13:28:19 Hmmm, I can't repro the failure locally, with a "u
+ touch_editable->WaitForSelectionChangeCallback();
+ touch_editable->Reset();
+ } else {
+ touch_editable->Reset();
+ touch_editable->WaitForGestureAck();
+ }
// Check if cursor handle is showing.
ui::TouchSelectionController* controller =
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl_unittest.cc ('k') | content/common/input/web_input_event_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698