namespace aura {
namespace {
-bool PlatformSupportsMultipleHosts() {
-#if defined(USE_OZONE)
- // Creating multiple WindowTreeHostOzone instances is broken.
- return false;
-#else
- return true;
-#endif
-}
-
// A delegate that always returns a non-client component for hit tests.
class NonClientDelegate : public test::TestWindowDelegate {
public:
TestEventClient client(root_window());
test::TestWindowDelegate d;
- ui::test::TestEventHandler* nonlock_ef = new ui::test::TestEventHandler;
- ui::test::TestEventHandler* lock_ef = new ui::test::TestEventHandler;
- client.GetNonLockWindow()->SetEventFilter(nonlock_ef);
- client.GetLockWindow()->SetEventFilter(lock_ef);
+ ui::test::TestEventHandler nonlock_ef;
+ ui::test::TestEventHandler lock_ef;
+ client.GetNonLockWindow()->AddPreTargetHandler(&nonlock_ef);
+ client.GetLockWindow()->AddPreTargetHandler(&lock_ef);
Window* w1 = test::CreateTestWindowWithBounds(gfx::Rect(10, 10, 20, 20),
client.GetNonLockWindow());
// i.e. never sent to the non-lock container's event filter.
test::EventGenerator generator(root_window(), w1);
generator.ClickLeftButton();
- EXPECT_EQ(0, nonlock_ef->num_mouse_events());
+ EXPECT_EQ(0, nonlock_ef.num_mouse_events());
// Events sent to a window in the lock container will be processed.
test::EventGenerator generator3(root_window(), w3.get());
generator3.PressLeftButton();
- EXPECT_EQ(1, lock_ef->num_mouse_events());
+ EXPECT_EQ(1, lock_ef.num_mouse_events());
}
// Prevent w3 from being deleted by the hierarchy since its delegate is owned
}
TEST_F(WindowEventDispatcherTest, IgnoreUnknownKeys) {
- ui::test::TestEventHandler* filter = new ConsumeKeyHandler;
- root_window()->SetEventFilter(filter); // passes ownership
+ ConsumeKeyHandler handler;
+ root_window()->AddPreTargetHandler(&handler);
ui::KeyEvent unknown_event(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0, false);
DispatchEventUsingWindowDispatcher(&unknown_event);
EXPECT_FALSE(unknown_event.handled());
- EXPECT_EQ(0, filter->num_key_events());
+ EXPECT_EQ(0, handler.num_key_events());
ui::KeyEvent known_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, false);
DispatchEventUsingWindowDispatcher(&known_event);
EXPECT_TRUE(known_event.handled());
- EXPECT_EQ(1, filter->num_key_events());
+ EXPECT_EQ(1, handler.num_key_events());
}
TEST_F(WindowEventDispatcherTest, NoDelegateWindowReceivesKeyEvents) {
// Tests that touch-events that are beyond the bounds of the root-window do get
// propagated to the event filters correctly with the root as the target.
TEST_F(WindowEventDispatcherTest, TouchEventsOutsideBounds) {
- ui::test::TestEventHandler* filter = new ui::test::TestEventHandler;
- root_window()->SetEventFilter(filter); // passes ownership
+ ui::test::TestEventHandler handler;
+ root_window()->AddPreTargetHandler(&handler);
gfx::Point position = root_window()->bounds().origin();
position.Offset(-10, -10);
ui::TouchEvent press(ui::ET_TOUCH_PRESSED, position, 0, base::TimeDelta());
DispatchEventUsingWindowDispatcher(&press);
- EXPECT_EQ(1, filter->num_touch_events());
+ EXPECT_EQ(1, handler.num_touch_events());
position = root_window()->bounds().origin();
position.Offset(root_window()->bounds().width() + 10,
root_window()->bounds().height() + 10);
ui::TouchEvent release(ui::ET_TOUCH_RELEASED, position, 0, base::TimeDelta());
DispatchEventUsingWindowDispatcher(&release);
- EXPECT_EQ(2, filter->num_touch_events());
+ EXPECT_EQ(2, handler.num_touch_events());
}
// Tests that scroll events are dispatched correctly.
TEST_F(WindowEventDispatcherTest, ScrollEventDispatch) {
base::TimeDelta now = ui::EventTimeForNow();
- ui::test::TestEventHandler* filter = new ui::test::TestEventHandler;
- root_window()->SetEventFilter(filter);
+ ui::test::TestEventHandler handler;
+ root_window()->AddPreTargetHandler(&handler);
test::TestWindowDelegate delegate;
scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
0, -10,
2);
DispatchEventUsingWindowDispatcher(&scroll1);
- EXPECT_EQ(1, filter->num_scroll_events());
+ EXPECT_EQ(1, handler.num_scroll_events());
// Scroll event on a window should be dispatched properly.
ui::ScrollEvent scroll2(ui::ET_SCROLL,
-10, 0,
2);
DispatchEventUsingWindowDispatcher(&scroll2);
- EXPECT_EQ(2, filter->num_scroll_events());
+ EXPECT_EQ(2, handler.num_scroll_events());
+ root_window()->RemovePreTargetHandler(&handler);
}
namespace {
public:
typedef std::vector<ui::EventType> Events;
typedef std::vector<gfx::Point> EventLocations;
+ typedef std::vector<int> EventFlags;
EventFilterRecorder()
: wait_until_event_(ui::ET_UNKNOWN) {
const EventLocations& mouse_locations() const { return mouse_locations_; }
gfx::Point mouse_location(int i) const { return mouse_locations_[i]; }
const EventLocations& touch_locations() const { return touch_locations_; }
+ const EventFlags& mouse_event_flags() const { return mouse_event_flags_; }
void WaitUntilReceivedEvent(ui::EventType type) {
wait_until_event_ = type;
events_.clear();
mouse_locations_.clear();
touch_locations_.clear();
+ mouse_event_flags_.clear();
}
// ui::EventHandler overrides:
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
mouse_locations_.push_back(event->location());
+ mouse_event_flags_.push_back(event->flags());
}
virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
Events events_;
EventLocations mouse_locations_;
EventLocations touch_locations_;
+ EventFlags mouse_event_flags_;
DISALLOW_COPY_AND_ASSIGN(EventFilterRecorder);
};
// over |window| and verify |window| gets it (|window| gets it because it has
// capture).
EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
+ EventFilterRecorder recorder;
scoped_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
window->SetBounds(gfx::Rect(20, 20, 40, 30));
- EventFilterRecorder* recorder = new EventFilterRecorder;
- window->SetEventFilter(recorder); // Takes ownership.
+ window->AddPreTargetHandler(&recorder);
window->SetCapture();
const ui::MouseEvent press_event(
ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
host()->dispatcher()->RepostEvent(press_event);
RunAllPendingInMessageLoop(); // Necessitated by RepostEvent().
// Mouse moves/enters may be generated. We only care about a pressed.
- EXPECT_TRUE(EventTypesToString(recorder->events()).find("MOUSE_PRESSED") !=
- std::string::npos) << EventTypesToString(recorder->events());
+ EXPECT_TRUE(EventTypesToString(recorder.events()).find("MOUSE_PRESSED") !=
+ std::string::npos) << EventTypesToString(recorder.events());
}
TEST_F(WindowEventDispatcherTest, MouseMovesHeld) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
gfx::Point(0, 0), 0, 0);
DispatchEventUsingWindowDispatcher(&mouse_move_event);
// Discard MOUSE_ENTER.
- filter->Reset();
+ recorder.Reset();
host()->dispatcher()->HoldPointerMoves();
ui::MouseEvent mouse_dragged_event(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0),
gfx::Point(0, 0), 0, 0);
DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
// Check that we do dispatch the held MOUSE_DRAGGED event before another type
// of event.
gfx::Point(0, 0), 0, 0);
DispatchEventUsingWindowDispatcher(&mouse_pressed_event);
EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
- EventTypesToString(filter->events()));
- filter->Reset();
+ EventTypesToString(recorder.events()));
+ recorder.Reset();
// Check that we coalesce held MOUSE_DRAGGED events.
ui::MouseEvent mouse_dragged_event2(ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10),
gfx::Point(10, 10), 0, 0);
DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
DispatchEventUsingWindowDispatcher(&mouse_dragged_event2);
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
DispatchEventUsingWindowDispatcher(&mouse_pressed_event);
EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
- EventTypesToString(filter->events()));
- filter->Reset();
+ EventTypesToString(recorder.events()));
+ recorder.Reset();
// Check that on ReleasePointerMoves, held events are not dispatched
// immediately, but posted instead.
DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
host()->dispatcher()->ReleasePointerMoves();
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
RunAllPendingInMessageLoop();
- EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(filter->events()));
- filter->Reset();
+ EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(recorder.events()));
+ recorder.Reset();
// However if another message comes in before the dispatch of the posted
// event, check that the posted event is dispatched before this new event.
host()->dispatcher()->ReleasePointerMoves();
DispatchEventUsingWindowDispatcher(&mouse_pressed_event);
EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
- EventTypesToString(filter->events()));
- filter->Reset();
+ EventTypesToString(recorder.events()));
+ recorder.Reset();
RunAllPendingInMessageLoop();
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
// Check that if the other message is another MOUSE_DRAGGED, we still coalesce
// them.
DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
host()->dispatcher()->ReleasePointerMoves();
DispatchEventUsingWindowDispatcher(&mouse_dragged_event2);
- EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(filter->events()));
- filter->Reset();
+ EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(recorder.events()));
+ recorder.Reset();
RunAllPendingInMessageLoop();
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
// Check that synthetic mouse move event has a right location when issued
// while holding pointer moves.
window->SetBounds(gfx::Rect(15, 15, 80, 80));
DispatchEventUsingWindowDispatcher(&mouse_dragged_event3);
RunAllPendingInMessageLoop();
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
host()->dispatcher()->ReleasePointerMoves();
RunAllPendingInMessageLoop();
- EXPECT_EQ("MOUSE_MOVED", EventTypesToString(filter->events()));
- EXPECT_EQ(gfx::Point(13, 13), filter->mouse_location(0));
- filter->Reset();
+ EXPECT_EQ("MOUSE_MOVED", EventTypesToString(recorder.events()));
+ EXPECT_EQ(gfx::Point(13, 13), recorder.mouse_location(0));
+ recorder.Reset();
+ root_window()->RemovePreTargetHandler(&recorder);
}
TEST_F(WindowEventDispatcherTest, TouchMovesHeld) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
ui::TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, touch_location,
0, base::TimeDelta());
DispatchEventUsingWindowDispatcher(&touch_pressed_event);
- filter->WaitUntilReceivedEvent(ui::ET_GESTURE_SHOW_PRESS);
- filter->Reset();
+ recorder.WaitUntilReceivedEvent(ui::ET_GESTURE_SHOW_PRESS);
+ recorder.Reset();
host()->dispatcher()->HoldPointerMoves();
ui::TouchEvent touch_moved_event(ui::ET_TOUCH_MOVED, touch_location,
0, base::TimeDelta());
DispatchEventUsingWindowDispatcher(&touch_moved_event);
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
// Check that on ReleasePointerMoves, held events are not dispatched
// immediately, but posted instead.
DispatchEventUsingWindowDispatcher(&touch_moved_event);
host()->dispatcher()->ReleasePointerMoves();
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
RunAllPendingInMessageLoop();
- EXPECT_EQ("TOUCH_MOVED", EventTypesToString(filter->events()));
- filter->Reset();
+ EXPECT_EQ("TOUCH_MOVED", EventTypesToString(recorder.events()));
+ recorder.Reset();
// If another touch event occurs then the held touch should be dispatched
// immediately before it.
ui::TouchEvent touch_released_event(ui::ET_TOUCH_RELEASED, touch_location,
0, base::TimeDelta());
- filter->Reset();
+ recorder.Reset();
host()->dispatcher()->HoldPointerMoves();
DispatchEventUsingWindowDispatcher(&touch_moved_event);
DispatchEventUsingWindowDispatcher(&touch_released_event);
EXPECT_EQ("TOUCH_MOVED TOUCH_RELEASED GESTURE_TAP_CANCEL GESTURE_END",
- EventTypesToString(filter->events()));
- filter->Reset();
+ EventTypesToString(recorder.events()));
+ recorder.Reset();
host()->dispatcher()->ReleasePointerMoves();
RunAllPendingInMessageLoop();
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
}
class HoldPointerOnScrollHandler : public ui::test::TestEventHandler {
// Tests that touch-move events don't contribute to an in-progress scroll
// gesture if touch-move events are being held by the dispatcher.
TEST_F(WindowEventDispatcherTest, TouchMovesHeldOnScroll) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter);
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
- HoldPointerOnScrollHandler handler(host()->dispatcher(), filter);
+ HoldPointerOnScrollHandler handler(host()->dispatcher(), &recorder);
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
&delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
window->AddPreTargetHandler(&handler);
// touch-release), the held touch-move event will have been dispatched first,
// along with the subsequent events (i.e. touch-release, scroll-end, and
// gesture-end).
- const EventFilterRecorder::Events& events = filter->events();
+ const EventFilterRecorder::Events& events = recorder.events();
EXPECT_EQ("TOUCH_MOVED TOUCH_RELEASED GESTURE_SCROLL_END GESTURE_END",
EventTypesToString(events));
- ASSERT_EQ(2u, filter->touch_locations().size());
+ ASSERT_EQ(2u, recorder.touch_locations().size());
EXPECT_EQ(gfx::Point(-40, 10).ToString(),
- filter->touch_locations()[0].ToString());
+ recorder.touch_locations()[0].ToString());
EXPECT_EQ(gfx::Point(-40, 10).ToString(),
- filter->touch_locations()[1].ToString());
+ recorder.touch_locations()[1].ToString());
}
// Tests that synthetic mouse events are ignored when mouse
// events are disabled.
TEST_F(WindowEventDispatcherTest, DispatchSyntheticMouseEvents) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
gfx::Point(10, 10), 0, 0);
DispatchEventUsingWindowDispatcher(&mouse1);
- EXPECT_FALSE(filter->events().empty());
- filter->Reset();
+ EXPECT_FALSE(recorder.events().empty());
+ recorder.Reset();
// Dispatch a synthetic mouse event when mouse events are enabled.
ui::MouseEvent mouse2(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
gfx::Point(10, 10), ui::EF_IS_SYNTHESIZED, 0);
DispatchEventUsingWindowDispatcher(&mouse2);
- EXPECT_FALSE(filter->events().empty());
- filter->Reset();
+ EXPECT_FALSE(recorder.events().empty());
+ recorder.Reset();
// Dispatch a synthetic mouse event when mouse events are disabled.
cursor_client.DisableMouseEvents();
DispatchEventUsingWindowDispatcher(&mouse2);
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
+ root_window()->RemovePreTargetHandler(&recorder);
+}
+
+// Tests synthetic mouse events generated when window bounds changes such that
+// the cursor previously outside the window becomes inside, or vice versa.
+// Do not synthesize events if the window ignores events or is invisible.
+TEST_F(WindowEventDispatcherTest, SynthesizeMouseEventsOnWindowBoundsChanged) {
+ test::TestWindowDelegate delegate;
+ scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+ &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
+ window->Show();
+ window->SetCapture();
+
+ EventFilterRecorder recorder;
+ window->AddPreTargetHandler(&recorder);
+
+ // Dispatch a non-synthetic mouse event to place cursor inside window bounds.
+ ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
+ gfx::Point(10, 10), 0, 0);
+ DispatchEventUsingWindowDispatcher(&mouse);
+ EXPECT_FALSE(recorder.events().empty());
+ recorder.Reset();
+
+ // Update the window bounds so that cursor is now outside the window.
+ // This should trigger a synthetic MOVED event.
+ gfx::Rect bounds1(20, 20, 100, 100);
+ window->SetBounds(bounds1);
+ RunAllPendingInMessageLoop();
+ ASSERT_FALSE(recorder.events().empty());
+ ASSERT_FALSE(recorder.mouse_event_flags().empty());
+ EXPECT_EQ(ui::ET_MOUSE_MOVED, recorder.events().back());
+ EXPECT_EQ(ui::EF_IS_SYNTHESIZED, recorder.mouse_event_flags().back());
+ recorder.Reset();
+
+ // Set window to ignore events.
+ window->set_ignore_events(true);
+
+ // Update the window bounds so that cursor is back inside the window.
+ // This should not trigger a synthetic event.
+ gfx::Rect bounds2(5, 5, 100, 100);
+ window->SetBounds(bounds2);
+ RunAllPendingInMessageLoop();
+ EXPECT_TRUE(recorder.events().empty());
+ recorder.Reset();
+
+ // Set window to accept events but invisible.
+ window->set_ignore_events(false);
+ window->Hide();
+ recorder.Reset();
+
+ // Update the window bounds so that cursor is outside the window.
+ // This should not trigger a synthetic event.
+ window->SetBounds(bounds1);
+ RunAllPendingInMessageLoop();
+ EXPECT_TRUE(recorder.events().empty());
}
// Tests that a mouse exit is dispatched to the last known cursor location
// when the cursor becomes invisible.
TEST_F(WindowEventDispatcherTest, DispatchMouseExitWhenCursorHidden) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
gfx::Point window_origin(7, 18);
gfx::Point mouse_location(gfx::Point(15, 25));
ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location,
mouse_location, 0, 0);
- EXPECT_TRUE(filter->events().empty());
+ EXPECT_TRUE(recorder.events().empty());
DispatchEventUsingWindowDispatcher(&mouse1);
- EXPECT_FALSE(filter->events().empty());
- filter->Reset();
+ EXPECT_FALSE(recorder.events().empty());
+ recorder.Reset();
// Hide the cursor and verify a mouse exit was dispatched.
host()->OnCursorVisibilityChanged(false);
- EXPECT_FALSE(filter->events().empty());
- EXPECT_EQ("MOUSE_EXITED", EventTypesToString(filter->events()));
+ EXPECT_FALSE(recorder.events().empty());
+ EXPECT_EQ("MOUSE_EXITED", EventTypesToString(recorder.events()));
// Verify the mouse exit was dispatched at the correct location
// (in the correct coordinate space).
int translated_x = mouse_location.x() - window_origin.x();
int translated_y = mouse_location.y() - window_origin.y();
gfx::Point translated_point(translated_x, translated_y);
- EXPECT_EQ(filter->mouse_location(0).ToString(), translated_point.ToString());
+ EXPECT_EQ(recorder.mouse_location(0).ToString(), translated_point.ToString());
+ root_window()->RemovePreTargetHandler(&recorder);
+}
+
+// Tests that a synthetic mouse exit is dispatched to the last known cursor
+// location after mouse events are disabled on the cursor client.
+TEST_F(WindowEventDispatcherTest,
+ DispatchSyntheticMouseExitAfterMouseEventsDisabled) {
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
+
+ test::TestWindowDelegate delegate;
+ gfx::Point window_origin(7, 18);
+ scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+ &delegate, 1234, gfx::Rect(window_origin, gfx::Size(100, 100)),
+ root_window()));
+ window->Show();
+
+ // Dispatch a mouse move event into the window.
+ gfx::Point mouse_location(gfx::Point(15, 25));
+ ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location,
+ mouse_location, 0, 0);
+ EXPECT_TRUE(recorder.events().empty());
+ DispatchEventUsingWindowDispatcher(&mouse1);
+ EXPECT_FALSE(recorder.events().empty());
+ recorder.Reset();
+
+ test::TestCursorClient cursor_client(root_window());
+ cursor_client.DisableMouseEvents();
+
+ gfx::Point mouse_exit_location(gfx::Point(150, 150));
+ ui::MouseEvent mouse2(ui::ET_MOUSE_EXITED, gfx::Point(150, 150),
+ gfx::Point(150, 150), ui::EF_IS_SYNTHESIZED, 0);
+ DispatchEventUsingWindowDispatcher(&mouse2);
+
+ EXPECT_FALSE(recorder.events().empty());
+ // We get the mouse exited event twice in our filter. Once during the
+ // predispatch phase and during the actual dispatch.
+ EXPECT_EQ("MOUSE_EXITED MOUSE_EXITED", EventTypesToString(recorder.events()));
+
+ // Verify the mouse exit was dispatched at the correct location
+ // (in the correct coordinate space).
+ int translated_x = mouse_exit_location.x() - window_origin.x();
+ int translated_y = mouse_exit_location.y() - window_origin.y();
+ gfx::Point translated_point(translated_x, translated_y);
+ EXPECT_EQ(recorder.mouse_location(0).ToString(), translated_point.ToString());
+ root_window()->RemovePreTargetHandler(&recorder);
}
class DeletingEventFilter : public ui::EventHandler {
DeletingWindowDelegate d11;
Window* w11 = CreateNormalWindow(11, w1.get(), &d11);
WindowTracker tracker;
- DeletingEventFilter* w1_filter = new DeletingEventFilter;
- w1->SetEventFilter(w1_filter);
+ DeletingEventFilter w1_filter;
+ w1->AddPreTargetHandler(&w1_filter);
client::GetFocusClient(w1.get())->FocusWindow(w11);
test::EventGenerator generator(root_window(), w11);
generator.ReleaseLeftButton();
// Delegate deletes w11. This will prevent the post-handle step from applying.
- w1_filter->Reset(false);
+ w1_filter.Reset(false);
d11.Reset(w11, true);
generator.PressKey(ui::VKEY_A, 0);
EXPECT_FALSE(tracker.Contains(w11));
// Pre-handle step deletes w11. This will prevent the delegate and the post-
// handle steps from applying.
w11 = CreateNormalWindow(11, w1.get(), &d11);
- w1_filter->Reset(true);
+ w1_filter.Reset(true);
d11.Reset(w11, false);
generator.PressLeftButton();
EXPECT_FALSE(tracker.Contains(w11));
// Tests whether we can repost the Tap down gesture event.
TEST_F(WindowEventDispatcherTest, RepostTapdownGestureTest) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
host()->dispatcher()->RepostEvent(event);
RunAllPendingInMessageLoop();
// TODO(rbyers): Currently disabled - crbug.com/170987
- EXPECT_FALSE(EventTypesToString(filter->events()).find("GESTURE_TAP_DOWN") !=
+ EXPECT_FALSE(EventTypesToString(recorder.events()).find("GESTURE_TAP_DOWN") !=
std::string::npos);
- filter->Reset();
+ recorder.Reset();
+ root_window()->RemovePreTargetHandler(&recorder);
}
// This class inherits from the EventFilterRecorder class which provides a
scoped_ptr<aura::Window> repost_source(CreateTestWindowWithDelegate(
&delegate, 1, gfx::Rect(0, 0, 50, 50), root_window()));
- RepostGestureEventRecorder* repost_event_recorder =
- new RepostGestureEventRecorder(repost_source.get(), repost_target.get());
- root_window()->SetEventFilter(repost_event_recorder); // passes ownership
+ RepostGestureEventRecorder repost_event_recorder(repost_source.get(),
+ repost_target.get());
+ root_window()->AddPreTargetHandler(&repost_event_recorder);
// Generate a tap down gesture for the repost_source. This will be reposted
// to repost_target.
RunAllPendingInMessageLoop();
int tap_down_count = 0;
- for (size_t i = 0; i < repost_event_recorder->events().size(); ++i) {
- if (repost_event_recorder->events()[i] == ui::ET_GESTURE_TAP_DOWN)
+ for (size_t i = 0; i < repost_event_recorder.events().size(); ++i) {
+ if (repost_event_recorder.events()[i] == ui::ET_GESTURE_TAP_DOWN)
++tap_down_count;
}
EXPECT_EQ(1, tap_down_count);
EXPECT_EQ(kExpectedTargetEvents,
- EventTypesToString(repost_event_recorder->events()));
+ EventTypesToString(repost_event_recorder.events()));
+ root_window()->RemovePreTargetHandler(&repost_event_recorder);
}
class OnMouseExitDeletingEventFilter : public EventFilterRecorder {
// Create window 1 and set its event filter. Window 1 will take ownership of
// the event filter.
scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
- OnMouseExitDeletingEventFilter* w1_filter =
- new OnMouseExitDeletingEventFilter();
- w1->SetEventFilter(w1_filter);
+ OnMouseExitDeletingEventFilter w1_filter;
+ w1->AddPreTargetHandler(&w1_filter);
w1->SetBounds(gfx::Rect(20, 20, 60, 60));
EXPECT_EQ(NULL, host()->dispatcher()->mouse_moved_handler());
// Set window 2 as the window that is to be deleted when a mouse-exited event
// happens on window 1.
- w1_filter->set_window_to_delete(w2);
+ w1_filter.set_window_to_delete(w2);
// Move mosue over window 2. This should generate a mouse-exited event for
// window 1 resulting in deletion of window 2. The original mouse-moved event
// Check events received by window 1.
EXPECT_EQ("MOUSE_ENTERED MOUSE_MOVED MOUSE_EXITED",
- EventTypesToString(w1_filter->events()));
+ EventTypesToString(w1_filter.events()));
}
namespace {
// Verifies GetRootWindow() from ~Window returns a valid root.
TEST_F(WindowEventDispatcherTest, ValidRootDuringDestruction) {
- if (!PlatformSupportsMultipleHosts())
- return;
bool got_destroying = false;
bool has_valid_root = false;
ValidRootDuringDestructionWindowObserver observer(&got_destroying,
// Verifies if a WindowTreeHost is deleted from dispatching a held mouse event
// we don't crash.
TEST_F(WindowEventDispatcherTest, DeleteHostFromHeldMouseEvent) {
- if (!PlatformSupportsMultipleHosts())
- return;
// Should be deleted by |delegate|.
WindowTreeHost* h2 = WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100));
h2->InitHost();
}
TEST_F(WindowEventDispatcherTest, WindowHideCancelsActiveTouches) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
DispatchEventUsingWindowDispatcher(&press);
EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN",
- EventTypesToString(filter->GetAndResetEvents()));
+ EventTypesToString(recorder.GetAndResetEvents()));
window->Hide();
EXPECT_EQ("TOUCH_CANCELLED GESTURE_TAP_CANCEL GESTURE_END",
- EventTypesToString(filter->events()));
+ EventTypesToString(recorder.events()));
+ root_window()->RemovePreTargetHandler(&recorder);
}
TEST_F(WindowEventDispatcherTest, WindowHideCancelsActiveGestures) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter); // passes ownership
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_MOVED "
"GESTURE_TAP_CANCEL GESTURE_SCROLL_BEGIN GESTURE_SCROLL_UPDATE "
"TOUCH_PRESSED GESTURE_BEGIN GESTURE_PINCH_BEGIN",
- EventTypesToString(filter->GetAndResetEvents()));
+ EventTypesToString(recorder.GetAndResetEvents()));
window->Hide();
EXPECT_EQ("TOUCH_CANCELLED GESTURE_PINCH_END GESTURE_END TOUCH_CANCELLED "
"GESTURE_SCROLL_END GESTURE_END",
- EventTypesToString(filter->events()));
+ EventTypesToString(recorder.events()));
+ root_window()->RemovePreTargetHandler(&recorder);
}
// Places two windows side by side. Presses down on one window, and starts a
// scroll. Sets capture on the other window and ensures that the "ending" events
// aren't sent to the window which gained capture.
TEST_F(WindowEventDispatcherTest, EndingEventDoesntRetarget) {
+ EventFilterRecorder recorder1;
+ EventFilterRecorder recorder2;
scoped_ptr<Window> window1(CreateNormalWindow(1, root_window(), NULL));
window1->SetBounds(gfx::Rect(0, 0, 40, 40));
scoped_ptr<Window> window2(CreateNormalWindow(2, root_window(), NULL));
window2->SetBounds(gfx::Rect(40, 0, 40, 40));
- EventFilterRecorder* filter1 = new EventFilterRecorder();
- window1->SetEventFilter(filter1); // passes ownership
- EventFilterRecorder* filter2 = new EventFilterRecorder();
- window2->SetEventFilter(filter2); // passes ownership
+ window1->AddPreTargetHandler(&recorder1);
+ window2->AddPreTargetHandler(&recorder2);
gfx::Point position = window1->bounds().origin();
ui::TouchEvent press(ui::ET_TOUCH_PRESSED, position, 0, base::TimeDelta());
EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_MOVED "
"GESTURE_TAP_CANCEL GESTURE_SCROLL_BEGIN GESTURE_SCROLL_UPDATE "
"TOUCH_CANCELLED GESTURE_SCROLL_END GESTURE_END",
- EventTypesToString(filter1->events()));
+ EventTypesToString(recorder1.events()));
- EXPECT_TRUE(filter2->events().empty());
+ EXPECT_TRUE(recorder2.events().empty());
}
namespace {
}
TEST_F(WindowEventDispatcherTestInHighDPI, TouchMovesHeldOnScroll) {
- EventFilterRecorder* filter = new EventFilterRecorder;
- root_window()->SetEventFilter(filter);
+ EventFilterRecorder recorder;
+ root_window()->AddPreTargetHandler(&recorder);
test::TestWindowDelegate delegate;
- HoldPointerOnScrollHandler handler(host()->dispatcher(), filter);
+ HoldPointerOnScrollHandler handler(host()->dispatcher(), &recorder);
scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
&delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
window->AddPreTargetHandler(&handler);
// touch-release), the held touch-move event will have been dispatched first,
// along with the subsequent events (i.e. touch-release, scroll-end, and
// gesture-end).
- const EventFilterRecorder::Events& events = filter->events();
+ const EventFilterRecorder::Events& events = recorder.events();
EXPECT_EQ("TOUCH_MOVED TOUCH_RELEASED GESTURE_SCROLL_END GESTURE_END",
EventTypesToString(events));
- ASSERT_EQ(2u, filter->touch_locations().size());
+ ASSERT_EQ(2u, recorder.touch_locations().size());
EXPECT_EQ(gfx::Point(-40, 10).ToString(),
- filter->touch_locations()[0].ToString());
+ recorder.touch_locations()[0].ToString());
EXPECT_EQ(gfx::Point(-40, 10).ToString(),
- filter->touch_locations()[1].ToString());
+ recorder.touch_locations()[1].ToString());
}
class SelfDestructDelegate : public test::TestWindowDelegate {
// event being dispatched is moved to a different dispatcher in response to an
// event in the inner loop.
TEST_F(WindowEventDispatcherTest, NestedEventDispatchTargetMoved) {
- if (!PlatformSupportsMultipleHosts())
- return;
scoped_ptr<WindowTreeHost> second_host(
WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50)));
second_host->InitHost();
TEST_F(WindowEventDispatcherTest,
CursorVisibilityChangedWhileCaptureWindowInAnotherDispatcher) {
- if (!PlatformSupportsMultipleHosts())
- return;
test::EventCountDelegate delegate;
scoped_ptr<Window> window(CreateTestWindowWithDelegate(&delegate, 123,
gfx::Rect(20, 10, 10, 20), root_window()));
projects / platform / framework / web / crosswalk.git / blobdiff