| 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 "ui/aura/root_window.h" | 5 #include "ui/aura/root_window.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "ui/aura/client/event_client.h" | 10 #include "ui/aura/client/event_client.h" |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 418 |
| 419 case ui::ET_GESTURE_SCROLL_UPDATE: | 419 case ui::ET_GESTURE_SCROLL_UPDATE: |
| 420 return "GESTURE_SCROLL_UPDATE"; | 420 return "GESTURE_SCROLL_UPDATE"; |
| 421 | 421 |
| 422 case ui::ET_GESTURE_TAP: | 422 case ui::ET_GESTURE_TAP: |
| 423 return "GESTURE_TAP"; | 423 return "GESTURE_TAP"; |
| 424 | 424 |
| 425 case ui::ET_GESTURE_TAP_DOWN: | 425 case ui::ET_GESTURE_TAP_DOWN: |
| 426 return "GESTURE_TAP_DOWN"; | 426 return "GESTURE_TAP_DOWN"; |
| 427 | 427 |
| 428 case ui::ET_GESTURE_BEGIN: | 428 case ui::ET_GESTURE_TAP_UP: |
| 429 return "GESTURE_BEGIN"; | 429 return "GESTURE_TAP_UP"; |
| 430 | |
| 431 case ui::ET_GESTURE_END: | |
| 432 return "GESTURE_END"; | |
| 433 | 430 |
| 434 case ui::ET_GESTURE_DOUBLE_TAP: | 431 case ui::ET_GESTURE_DOUBLE_TAP: |
| 435 return "GESTURE_DOUBLE_TAP"; | 432 return "GESTURE_DOUBLE_TAP"; |
| 436 | 433 |
| 437 default: | 434 default: |
| 438 break; | 435 break; |
| 439 } | 436 } |
| 440 return ""; | 437 return ""; |
| 441 } | 438 } |
| 442 | 439 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 466 TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), | 463 TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), |
| 467 1, base::TimeDelta()); | 464 1, base::TimeDelta()); |
| 468 int time_ms = | 465 int time_ms = |
| 469 static_cast<int>(ui::GestureConfiguration:: | 466 static_cast<int>(ui::GestureConfiguration:: |
| 470 min_touch_down_duration_in_seconds_for_click() * 1000); | 467 min_touch_down_duration_in_seconds_for_click() * 1000); |
| 471 TouchEvent touch_released_event( | 468 TouchEvent touch_released_event( |
| 472 ui::ET_TOUCH_RELEASED, gfx::Point(100, 101), 1, | 469 ui::ET_TOUCH_RELEASED, gfx::Point(100, 101), 1, |
| 473 base::TimeDelta::FromMilliseconds(time_ms)); | 470 base::TimeDelta::FromMilliseconds(time_ms)); |
| 474 root_window()->DispatchTouchEvent(&touch_pressed_event); | 471 root_window()->DispatchTouchEvent(&touch_pressed_event); |
| 475 root_window()->DispatchTouchEvent(&touch_released_event); | 472 root_window()->DispatchTouchEvent(&touch_released_event); |
| 476 EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED " | 473 EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP " |
| 477 "GESTURE_TAP MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED " | 474 "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED " |
| 478 "MOUSE_RELEASED GESTURE_END", | 475 "GESTURE_TAP_UP", |
| 479 EventTypesToString(filter->events())); | 476 EventTypesToString(filter->events())); |
| 480 filter->events().clear(); | 477 filter->events().clear(); |
| 481 } | 478 } |
| 482 | 479 |
| 483 // ET_TOUCH_PRESSED should generate a GESTURE_TAP_DOWN. | 480 // ET_TOUCH_PRESSED should generate a GESTURE_TAP_DOWN. |
| 484 { | 481 { |
| 485 TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), 1, | 482 TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), 1, |
| 486 base::TimeDelta()); | 483 base::TimeDelta()); |
| 487 root_window()->DispatchTouchEvent(&touch_event); | 484 root_window()->DispatchTouchEvent(&touch_event); |
| 488 EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN", | 485 EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN", |
| 489 EventTypesToString(filter->events())); | 486 EventTypesToString(filter->events())); |
| 490 filter->events().clear(); | 487 filter->events().clear(); |
| 491 } | 488 } |
| 492 | 489 |
| 493 // ET_TOUCH_MOVED should start a scroll and generate mouse drags (among other | 490 // ET_TOUCH_MOVED should start a scroll and generate mouse drags (among other |
| 494 // things). | 491 // things). |
| 495 { | 492 { |
| 496 TouchEvent touch_event(ui::ET_TOUCH_MOVED, gfx::Point(200, 201), 1, | 493 TouchEvent touch_event(ui::ET_TOUCH_MOVED, gfx::Point(200, 201), 1, |
| 497 base::TimeDelta()); | 494 base::TimeDelta()); |
| 498 root_window()->DispatchTouchEvent(&touch_event); | 495 root_window()->DispatchTouchEvent(&touch_event); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 514 EventTypesToString(filter->events())); | 511 EventTypesToString(filter->events())); |
| 515 filter->events().clear(); | 512 filter->events().clear(); |
| 516 } | 513 } |
| 517 | 514 |
| 518 // ET_TOUCH_RELEASED should end the scroll and release the mouse. | 515 // ET_TOUCH_RELEASED should end the scroll and release the mouse. |
| 519 { | 516 { |
| 520 TouchEvent touch_event(ui::ET_TOUCH_RELEASED, gfx::Point(300, 201), 1, | 517 TouchEvent touch_event(ui::ET_TOUCH_RELEASED, gfx::Point(300, 201), 1, |
| 521 base::TimeDelta()); | 518 base::TimeDelta()); |
| 522 root_window()->DispatchTouchEvent(&touch_event); | 519 root_window()->DispatchTouchEvent(&touch_event); |
| 523 EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED " | 520 EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED " |
| 524 "GESTURE_END", | 521 "GESTURE_TAP_UP", |
| 525 EventTypesToString(filter->events())); | 522 EventTypesToString(filter->events())); |
| 526 filter->events().clear(); | 523 filter->events().clear(); |
| 527 } | 524 } |
| 528 } | 525 } |
| 529 | 526 |
| 530 TEST_F(RootWindowTest, MouseMoveThenTouch) { | 527 TEST_F(RootWindowTest, MouseMoveThenTouch) { |
| 531 EventFilterRecorder* filter = new EventFilterRecorder; | 528 EventFilterRecorder* filter = new EventFilterRecorder; |
| 532 root_window()->SetEventFilter(filter); // passes ownership | 529 root_window()->SetEventFilter(filter); // passes ownership |
| 533 | 530 |
| 534 test::TestWindowDelegate delegate; | 531 test::TestWindowDelegate delegate; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 552 TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(151, 151), | 549 TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(151, 151), |
| 553 1, base::TimeDelta()); | 550 1, base::TimeDelta()); |
| 554 int time_ms = | 551 int time_ms = |
| 555 static_cast<int>(ui::GestureConfiguration:: | 552 static_cast<int>(ui::GestureConfiguration:: |
| 556 min_touch_down_duration_in_seconds_for_click() * 1000); | 553 min_touch_down_duration_in_seconds_for_click() * 1000); |
| 557 TouchEvent touch_released_event( | 554 TouchEvent touch_released_event( |
| 558 ui::ET_TOUCH_RELEASED, gfx::Point(151, 151), 1, | 555 ui::ET_TOUCH_RELEASED, gfx::Point(151, 151), 1, |
| 559 base::TimeDelta::FromMilliseconds(time_ms)); | 556 base::TimeDelta::FromMilliseconds(time_ms)); |
| 560 root_window()->DispatchTouchEvent(&touch_pressed_event); | 557 root_window()->DispatchTouchEvent(&touch_pressed_event); |
| 561 root_window()->DispatchTouchEvent(&touch_released_event); | 558 root_window()->DispatchTouchEvent(&touch_released_event); |
| 562 EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED " | 559 EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP " |
| 563 "GESTURE_TAP MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED " | 560 "MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED " |
| 564 "MOUSE_PRESSED MOUSE_RELEASED GESTURE_END", | 561 "MOUSE_RELEASED GESTURE_TAP_UP", |
| 565 EventTypesToString(filter->events())); | 562 EventTypesToString(filter->events())); |
| 566 filter->events().clear(); | 563 filter->events().clear(); |
| 567 } | 564 } |
| 568 } | 565 } |
| 569 | 566 |
| 570 } // namespace aura | 567 } // namespace aura |
| OLD | NEW |