OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/web_contents/touch_editable_impl_aura.h" | 5 #include "content/browser/web_contents/touch_editable_impl_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 #include "content/browser/web_contents/web_contents_impl.h" | 12 #include "content/browser/web_contents/web_contents_impl.h" |
13 #include "content/browser/web_contents/web_contents_view_aura.h" | 13 #include "content/browser/web_contents/web_contents_view_aura.h" |
14 #include "content/common/input/web_input_event_traits.h" | |
14 #include "content/public/browser/render_frame_host.h" | 15 #include "content/public/browser/render_frame_host.h" |
15 #include "content/public/browser/web_contents_view.h" | 16 #include "content/public/browser/web_contents_view.h" |
16 #include "content/public/common/content_switches.h" | 17 #include "content/public/common/content_switches.h" |
17 #include "content/public/test/browser_test_utils.h" | 18 #include "content/public/test/browser_test_utils.h" |
18 #include "content/public/test/content_browser_test.h" | 19 #include "content/public/test/content_browser_test.h" |
19 #include "content/public/test/content_browser_test_utils.h" | 20 #include "content/public/test/content_browser_test_utils.h" |
20 #include "content/public/test/test_utils.h" | 21 #include "content/public/test/test_utils.h" |
21 #include "content/shell/browser/shell.h" | 22 #include "content/shell/browser/shell.h" |
22 #include "ui/aura/test/event_generator.h" | 23 #include "ui/aura/test/event_generator.h" |
23 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
317 aura::test::EventGenerator generator(content->GetRootWindow(), content); | 318 aura::test::EventGenerator generator(content->GetRootWindow(), content); |
318 gfx::Rect bounds = content->GetBoundsInRootWindow(); | 319 gfx::Rect bounds = content->GetBoundsInRootWindow(); |
319 EXPECT_EQ(touch_editable->rwhva_, rwhva); | 320 EXPECT_EQ(touch_editable->rwhva_, rwhva); |
320 | 321 |
321 ExecuteSyncJSFunction(main_frame, "focus_textfield()"); | 322 ExecuteSyncJSFunction(main_frame, "focus_textfield()"); |
322 touch_editable->WaitForSelectionChangeCallback(); | 323 touch_editable->WaitForSelectionChangeCallback(); |
323 | 324 |
324 // Tap textfield | 325 // Tap textfield |
325 touch_editable->Reset(); | 326 touch_editable->Reset(); |
326 generator.GestureTapAt(gfx::Point(bounds.x() + 50, bounds.y() + 40)); | 327 generator.GestureTapAt(gfx::Point(bounds.x() + 50, bounds.y() + 40)); |
327 // Tap Down and Tap acks are sent synchronously. | 328 if (WebInputEventTraits::IgnoresAckDisposition( |
328 touch_editable->WaitForSelectionChangeCallback(); | 329 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
| |
329 touch_editable->Reset(); | 330 touch_editable->WaitForSelectionChangeCallback(); |
331 touch_editable->Reset(); | |
332 } else { | |
333 touch_editable->Reset(); | |
334 touch_editable->WaitForGestureAck(); | |
335 } | |
330 | 336 |
331 // Check if cursor handle is showing. | 337 // Check if cursor handle is showing. |
332 ui::TouchSelectionController* controller = | 338 ui::TouchSelectionController* controller = |
333 touch_editable->touch_selection_controller_.get(); | 339 touch_editable->touch_selection_controller_.get(); |
334 EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, touch_editable->text_input_type_); | 340 EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, touch_editable->text_input_type_); |
335 EXPECT_TRUE(controller); | 341 EXPECT_TRUE(controller); |
336 | 342 |
337 scoped_ptr<base::Value> value = | 343 scoped_ptr<base::Value> value = |
338 content::ExecuteScriptAndGetValue(main_frame, "get_cursor_position()"); | 344 content::ExecuteScriptAndGetValue(main_frame, "get_cursor_position()"); |
339 int cursor_pos = -1; | 345 int cursor_pos = -1; |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
375 TouchSelectionOnLongPressTest) { | 381 TouchSelectionOnLongPressTest) { |
376 TestTouchSelectionOnLongPress(); | 382 TestTouchSelectionOnLongPress(); |
377 } | 383 } |
378 | 384 |
379 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, | 385 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
380 TouchCursorInTextfieldTest) { | 386 TouchCursorInTextfieldTest) { |
381 TestTouchCursorInTextfield(); | 387 TestTouchCursorInTextfield(); |
382 } | 388 } |
383 | 389 |
384 } // namespace content | 390 } // namespace content |
OLD | NEW |