OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/views/mus/pointer_watcher_event_router.h" | 5 #include "ui/views/mus/pointer_watcher_event_router.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "services/ui/public/cpp/tests/window_tree_client_private.h" | 10 #include "services/ui/public/cpp/tests/window_tree_client_private.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 | 117 |
118 TEST_F(PointerWatcherEventRouterTest, PointerWatcherNoMove) { | 118 TEST_F(PointerWatcherEventRouterTest, PointerWatcherNoMove) { |
119 base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); | 119 base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); |
120 ScopedViewsTestHelper helper; | 120 ScopedViewsTestHelper helper; |
121 ASSERT_TRUE(WindowManagerConnection::Get()); | 121 ASSERT_TRUE(WindowManagerConnection::Get()); |
122 PointerWatcherEventRouter* pointer_watcher_event_router = | 122 PointerWatcherEventRouter* pointer_watcher_event_router = |
123 WindowManagerConnection::Get()->pointer_watcher_event_router(); | 123 WindowManagerConnection::Get()->pointer_watcher_event_router(); |
124 ASSERT_TRUE(pointer_watcher_event_router); | 124 ASSERT_TRUE(pointer_watcher_event_router); |
125 | 125 |
126 ui::PointerEvent pointer_event_down( | 126 ui::PointerEvent pointer_event_down( |
127 ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, | 127 ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0, |
128 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), | 128 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), |
129 base::TimeTicks()); | 129 base::TimeTicks()); |
130 ui::PointerEvent pointer_event_up( | 130 ui::PointerEvent pointer_event_up( |
131 ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, | 131 ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0, |
132 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE), | 132 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE), |
133 base::TimeTicks()); | 133 base::TimeTicks()); |
134 | 134 |
135 // PointerWatchers receive pointer down events. | 135 // PointerWatchers receive pointer down events. |
136 TestPointerWatcher watcher1; | 136 TestPointerWatcher watcher1; |
137 pointer_watcher_event_router->AddPointerWatcher(&watcher1, false); | 137 pointer_watcher_event_router->AddPointerWatcher(&watcher1, false); |
138 OnPointerEventObserved(pointer_event_down); | 138 OnPointerEventObserved(pointer_event_down); |
139 EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type()); | 139 EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type()); |
140 watcher1.Reset(); | 140 watcher1.Reset(); |
141 | 141 |
(...skipping 28 matching lines...) Expand all Loading... |
170 | 170 |
171 TEST_F(PointerWatcherEventRouterTest, PointerWatcherMove) { | 171 TEST_F(PointerWatcherEventRouterTest, PointerWatcherMove) { |
172 base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); | 172 base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); |
173 ScopedViewsTestHelper helper; | 173 ScopedViewsTestHelper helper; |
174 ASSERT_TRUE(WindowManagerConnection::Get()); | 174 ASSERT_TRUE(WindowManagerConnection::Get()); |
175 PointerWatcherEventRouter* pointer_watcher_event_router = | 175 PointerWatcherEventRouter* pointer_watcher_event_router = |
176 WindowManagerConnection::Get()->pointer_watcher_event_router(); | 176 WindowManagerConnection::Get()->pointer_watcher_event_router(); |
177 ASSERT_TRUE(pointer_watcher_event_router); | 177 ASSERT_TRUE(pointer_watcher_event_router); |
178 | 178 |
179 ui::PointerEvent pointer_event_down( | 179 ui::PointerEvent pointer_event_down( |
180 ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, | 180 ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0, |
181 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), | 181 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), |
182 base::TimeTicks()); | 182 base::TimeTicks()); |
183 ui::PointerEvent pointer_event_move( | 183 ui::PointerEvent pointer_event_move( |
184 ui::ET_POINTER_MOVED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, | 184 ui::ET_POINTER_MOVED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0, |
185 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), | 185 ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), |
186 base::TimeTicks()); | 186 base::TimeTicks()); |
187 | 187 |
188 // PointerWatchers receive pointer down events. | 188 // PointerWatchers receive pointer down events. |
189 TestPointerWatcher watcher1; | 189 TestPointerWatcher watcher1; |
190 pointer_watcher_event_router->AddPointerWatcher(&watcher1, true); | 190 pointer_watcher_event_router->AddPointerWatcher(&watcher1, true); |
191 OnPointerEventObserved(pointer_event_down); | 191 OnPointerEventObserved(pointer_event_down); |
192 EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type()); | 192 EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type()); |
193 watcher1.Reset(); | 193 watcher1.Reset(); |
194 | 194 |
(...skipping 20 matching lines...) Expand all Loading... |
215 watcher2.Reset(); | 215 watcher2.Reset(); |
216 | 216 |
217 // Removing the last PointerWatcher stops sending events to it. | 217 // Removing the last PointerWatcher stops sending events to it. |
218 pointer_watcher_event_router->RemovePointerWatcher(&watcher2); | 218 pointer_watcher_event_router->RemovePointerWatcher(&watcher2); |
219 OnPointerEventObserved(pointer_event_move); | 219 OnPointerEventObserved(pointer_event_move); |
220 EXPECT_FALSE(watcher1.last_event_observed()); | 220 EXPECT_FALSE(watcher1.last_event_observed()); |
221 EXPECT_FALSE(watcher2.last_event_observed()); | 221 EXPECT_FALSE(watcher2.last_event_observed()); |
222 } | 222 } |
223 | 223 |
224 } // namespace views | 224 } // namespace views |
OLD | NEW |