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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: services/ui/ws/event_dispatcher_unittest.cc

Issue 2778943005: Keep root_location to be in pixels and display coordinates in WS. (Closed)
Patch Set: const Created 3 years, 7 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
« no previous file with comments | « services/ui/ws/event_dispatcher_delegate.h ('k') | services/ui/ws/platform_display_default.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/event_dispatcher_unittest.cc
diff --git a/services/ui/ws/event_dispatcher_unittest.cc b/services/ui/ws/event_dispatcher_unittest.cc
index e6d241bc1ab362652e6fb40315328f48ee3767db..be3217adcc6b96d364e6ee05719af6ec567b7098 100644
--- a/services/ui/ws/event_dispatcher_unittest.cc
+++ b/services/ui/ws/event_dispatcher_unittest.cc
@@ -106,13 +106,15 @@ class TestEventDispatcherDelegate : public EventDispatcherDelegate {
private:
// EventDispatcherDelegate:
void OnAccelerator(uint32_t accelerator,
+ const int64_t display_id,
const ui::Event& event,
AcceleratorPhase phase) override {
EXPECT_EQ(0u, last_accelerator_);
last_accelerator_ = accelerator;
last_accelerator_phase_ = phase;
}
- ServerWindow* GetFocusedWindowForEventDispatcher() override {
+ ServerWindow* GetFocusedWindowForEventDispatcher(
+ const int64_t display_id) override {
return focused_window_;
}
void SetNativeCapture(ServerWindow* window) override {}
@@ -125,9 +127,11 @@ class TestEventDispatcherDelegate : public EventDispatcherDelegate {
ServerWindow* old_capture_window) override {
lost_capture_window_ = old_capture_window;
}
- void OnMouseCursorLocationChanged(const gfx::Point& point) override {}
+ void OnMouseCursorLocationChanged(const gfx::Point& point,
+ const int64_t display_id) override {}
void DispatchInputEventToWindow(ServerWindow* target,
ClientSpecificId client_id,
+ const int64_t display_id,
const ui::Event& event,
Accelerator* accelerator) override {
std::unique_ptr<DispatchedEventDetails> details(new DispatchedEventDetails);
@@ -141,10 +145,12 @@ class TestEventDispatcherDelegate : public EventDispatcherDelegate {
bool in_nonclient_area) override {
return in_nonclient_area ? kNonclientAreaId : kClientAreaId;
}
- ServerWindow* GetRootWindowContaining(gfx::Point* location) override {
+ ServerWindow* GetRootWindowContaining(gfx::Point* location_in_display,
+ int64_t* display_id) override {
return root_;
}
- void OnEventTargetNotFound(const ui::Event& event) override {
+ void OnEventTargetNotFound(const ui::Event& event,
+ const int64_t display_id) override {
last_event_target_not_found_ = ui::Event::Clone(event);
}
@@ -200,7 +206,7 @@ void RunMouseEventTests(EventDispatcher* dispatcher,
const MouseEventTest& test = tests[i];
ASSERT_FALSE(dispatcher_delegate->has_queued_events())
<< " unexpected queued events before running " << i;
- dispatcher->ProcessEvent(ui::PointerEvent(test.input_event),
+ dispatcher->ProcessEvent(ui::PointerEvent(test.input_event), 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -341,7 +347,7 @@ TEST_F(EventDispatcherTest, ProcessEvent) {
const ui::PointerEvent ui_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(20, 25), gfx::Point(20, 25),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(ui_event,
+ event_dispatcher()->ProcessEvent(ui_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -360,7 +366,7 @@ TEST_F(EventDispatcherTest, ProcessEvent) {
TEST_F(EventDispatcherTest, ProcessEventNoTarget) {
// Send event without a target.
ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
- event_dispatcher()->ProcessEvent(key,
+ event_dispatcher()->ProcessEvent(key, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Event wasn't dispatched to a target.
@@ -425,7 +431,7 @@ TEST_F(EventDispatcherTest, EventMatching) {
dispatcher->AddAccelerator(accelerator_1, std::move(matcher));
ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(accelerator_1,
event_dispatcher_delegate->GetAndClearLastAccelerator());
@@ -433,24 +439,24 @@ TEST_F(EventDispatcherTest, EventMatching) {
// ignoring.
key = ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_W,
ui::EF_CONTROL_DOWN | ui::EF_NUM_LOCK_ON);
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(accelerator_1,
event_dispatcher_delegate->GetAndClearLastAccelerator());
key = ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_NONE);
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
uint32_t accelerator_2 = 2;
matcher = ui::CreateKeyMatcher(ui::mojom::KeyboardCode::W,
ui::mojom::kEventFlagNone);
dispatcher->AddAccelerator(accelerator_2, std::move(matcher));
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(accelerator_2,
event_dispatcher_delegate->GetAndClearLastAccelerator());
dispatcher->RemoveAccelerator(accelerator_2);
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
}
@@ -468,7 +474,7 @@ TEST_F(EventDispatcherTest, PostTargetAccelerator) {
ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
// The post-target accelerator should be fired if there is no focused window.
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(accelerator_1,
event_dispatcher_delegate->GetAndClearLastAccelerator());
std::unique_ptr<DispatchedEventDetails> details =
@@ -480,7 +486,7 @@ TEST_F(EventDispatcherTest, PostTargetAccelerator) {
event_dispatcher_delegate->SetFocusedWindowFromEventDispatcher(child.get());
// With a focused window the event should be dispatched.
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(details);
@@ -492,7 +498,7 @@ TEST_F(EventDispatcherTest, PostTargetAccelerator) {
EXPECT_FALSE(accelerator_weak_ptr);
// Post deletion there should be no accelerator
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(0u, event_dispatcher_delegate->GetAndClearLastAccelerator());
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(details);
@@ -527,14 +533,14 @@ TEST_F(EventDispatcherTest, ProcessPost) {
// Dispatch for ANY, which should trigger PRE and not call
// DispatchInputEventToWindow().
ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
- dispatcher->ProcessEvent(key, EventDispatcher::AcceleratorMatchPhase::ANY);
+ dispatcher->ProcessEvent(key, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
EXPECT_EQ(EventDispatcherDelegate::AcceleratorPhase::PRE,
event_dispatcher_delegate->last_accelerator_phase());
EXPECT_EQ(pre_id, event_dispatcher_delegate->GetAndClearLastAccelerator());
EXPECT_FALSE(event_dispatcher_delegate->has_queued_events());
// Dispatch for POST, which should trigger POST.
- dispatcher->ProcessEvent(key,
+ dispatcher->ProcessEvent(key, 0,
EventDispatcher::AcceleratorMatchPhase::POST_ONLY);
std::unique_ptr<DispatchedEventDetails> details =
event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
@@ -645,7 +651,7 @@ TEST_F(EventDispatcherTest, ClientAreaGoesToOwner) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(12, 12), gfx::Point(12, 12),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(press_event,
+ dispatcher->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Events should target child and be in the non-client area.
@@ -660,7 +666,7 @@ TEST_F(EventDispatcherTest, ClientAreaGoesToOwner) {
const ui::PointerEvent move_event(
ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(17, 18), gfx::Point(17, 18),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, 0));
- dispatcher->ProcessEvent(move_event,
+ dispatcher->ProcessEvent(move_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Still same target.
@@ -673,7 +679,7 @@ TEST_F(EventDispatcherTest, ClientAreaGoesToOwner) {
const ui::PointerEvent release_event(ui::MouseEvent(
ui::ET_MOUSE_RELEASED, gfx::Point(17, 18), gfx::Point(17, 18),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(release_event,
+ dispatcher->ProcessEvent(release_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// The event should not have been dispatched to the delegate.
@@ -687,7 +693,7 @@ TEST_F(EventDispatcherTest, ClientAreaGoesToOwner) {
const ui::PointerEvent press_event2(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(21, 22), gfx::Point(21, 22),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(press_event2,
+ dispatcher->ProcessEvent(press_event2, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(event_dispatcher_delegate->has_queued_events());
@@ -718,7 +724,7 @@ TEST_F(EventDispatcherTest, AdditionalClientArea) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(28, 11), gfx::Point(28, 11),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(press_event,
+ event_dispatcher()->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Events should target child and be in the client area.
@@ -740,7 +746,7 @@ TEST_F(EventDispatcherTest, HitTestMask) {
const ui::PointerEvent move1(ui::MouseEvent(
ui::ET_MOUSE_MOVED, gfx::Point(11, 11), gfx::Point(11, 11),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, 0));
- event_dispatcher()->ProcessEvent(move1,
+ event_dispatcher()->ProcessEvent(move1, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Event went through the child window and hit the root.
@@ -755,7 +761,7 @@ TEST_F(EventDispatcherTest, HitTestMask) {
const ui::PointerEvent move2(ui::MouseEvent(
ui::ET_MOUSE_MOVED, gfx::Point(11, 12), gfx::Point(11, 12),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, 0));
- event_dispatcher()->ProcessEvent(move2,
+ event_dispatcher()->ProcessEvent(move2, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Mouse exits the root.
@@ -786,7 +792,7 @@ TEST_F(EventDispatcherTest, DontFocusOnSecondDown) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(12, 12), gfx::Point(12, 12),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(press_event,
+ dispatcher->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
@@ -800,7 +806,7 @@ TEST_F(EventDispatcherTest, DontFocusOnSecondDown) {
const ui::PointerEvent touch_event(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(53, 54), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 2)));
- dispatcher->ProcessEvent(touch_event,
+ dispatcher->ProcessEvent(touch_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_FALSE(event_dispatcher_delegate->has_queued_events());
@@ -824,7 +830,7 @@ TEST_F(EventDispatcherTest, TwoPointersActive) {
const ui::PointerEvent touch_event1(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(12, 13), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(touch_event1,
+ dispatcher->ProcessEvent(touch_event1, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
@@ -834,7 +840,7 @@ TEST_F(EventDispatcherTest, TwoPointersActive) {
const ui::PointerEvent drag_event1(ui::TouchEvent(
ui::ET_TOUCH_MOVED, gfx::Point(53, 54), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(drag_event1,
+ dispatcher->ProcessEvent(drag_event1, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(child1.get(), details->window);
@@ -843,7 +849,7 @@ TEST_F(EventDispatcherTest, TwoPointersActive) {
const ui::PointerEvent touch_event2(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(54, 55), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 2)));
- dispatcher->ProcessEvent(touch_event2,
+ dispatcher->ProcessEvent(touch_event2, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(child2.get(), details->window);
@@ -852,13 +858,13 @@ TEST_F(EventDispatcherTest, TwoPointersActive) {
const ui::PointerEvent drag_event2(ui::TouchEvent(
ui::ET_TOUCH_MOVED, gfx::Point(13, 14), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 2)));
- dispatcher->ProcessEvent(drag_event2,
+ dispatcher->ProcessEvent(drag_event2, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(child2.get(), details->window);
// Drag again with id 1, child1 should continue to get it.
- dispatcher->ProcessEvent(drag_event1,
+ dispatcher->ProcessEvent(drag_event1, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(child1.get(), details->window);
@@ -867,14 +873,14 @@ TEST_F(EventDispatcherTest, TwoPointersActive) {
const ui::PointerEvent touch_release(ui::TouchEvent(
ui::ET_TOUCH_RELEASED, gfx::Point(54, 55), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(touch_release,
+ dispatcher->ProcessEvent(touch_release, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(child1.get(), details->window);
const ui::PointerEvent touch_event3(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(54, 55), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 2)));
- dispatcher->ProcessEvent(touch_event3,
+ dispatcher->ProcessEvent(touch_event3, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(child2.get(), details->window);
@@ -894,7 +900,7 @@ TEST_F(EventDispatcherTest, DestroyWindowWhileGettingEvents) {
const ui::PointerEvent touch_event1(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(12, 13), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(touch_event1,
+ dispatcher->ProcessEvent(touch_event1, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
@@ -907,7 +913,7 @@ TEST_F(EventDispatcherTest, DestroyWindowWhileGettingEvents) {
const ui::PointerEvent drag_event1(ui::TouchEvent(
ui::ET_TOUCH_MOVED, gfx::Point(53, 54), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(drag_event1,
+ dispatcher->ProcessEvent(drag_event1, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(nullptr, details.get());
@@ -928,7 +934,7 @@ TEST_F(EventDispatcherTest, MouseInExtendedHitTestRegion) {
const ui::PointerEvent ui_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(8, 9), gfx::Point(8, 9),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(ui_event,
+ dispatcher->ProcessEvent(ui_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
@@ -938,7 +944,7 @@ TEST_F(EventDispatcherTest, MouseInExtendedHitTestRegion) {
const ui::PointerEvent release_event(ui::MouseEvent(
ui::ET_MOUSE_RELEASED, gfx::Point(8, 9), gfx::Point(8, 9),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(release_event,
+ dispatcher->ProcessEvent(release_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_FALSE(event_dispatcher_delegate->has_queued_events());
@@ -948,7 +954,7 @@ TEST_F(EventDispatcherTest, MouseInExtendedHitTestRegion) {
// Change the extended hit test region and send event in extended hit test
// region. Should result in exit for root, followed by press for child.
child->set_extended_hit_test_region(gfx::Insets(5, 5, 5, 5));
- dispatcher->ProcessEvent(ui_event,
+ dispatcher->ProcessEvent(ui_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_EQ(root, details->window);
@@ -1014,7 +1020,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
const ui::PointerEvent left_press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(left_press_event,
+ dispatcher->ProcessEvent(left_press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Events should target child.
@@ -1031,7 +1037,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON,
ui::EF_RIGHT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(right_press_event,
+ dispatcher->ProcessEvent(right_press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(IsMouseButtonDown());
@@ -1041,7 +1047,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
ui::ET_MOUSE_RELEASED, gfx::Point(5, 5), gfx::Point(5, 5),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON,
ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(left_release_event,
+ dispatcher->ProcessEvent(left_release_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(IsMouseButtonDown());
@@ -1050,7 +1056,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
const ui::PointerEvent touch_event(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(15, 15), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 2)));
- dispatcher->ProcessEvent(touch_event,
+ dispatcher->ProcessEvent(touch_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(IsMouseButtonDown());
@@ -1060,7 +1066,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(15, 5), gfx::Point(15, 5),
base::TimeTicks(), ui::EF_RIGHT_MOUSE_BUTTON,
ui::EF_RIGHT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(move_event,
+ dispatcher->ProcessEvent(move_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_TRUE(IsMouseButtonDown());
@@ -1070,7 +1076,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
ui::MouseEvent(ui::ET_MOUSE_RELEASED, gfx::Point(5, 5),
gfx::Point(5, 5), base::TimeTicks(),
ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_RIGHT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(right_release_event,
+ dispatcher->ProcessEvent(right_release_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
details = event_dispatcher_delegate->GetAndAdvanceDispatchedEventDetails();
EXPECT_FALSE(IsMouseButtonDown());
@@ -1082,7 +1088,7 @@ TEST_F(EventDispatcherTest, SetExplicitCapture) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(press_event,
+ dispatcher->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Events should target the root.
@@ -1142,7 +1148,7 @@ TEST_F(EventDispatcherTest, ExplicitCaptureOverridesImplicitCapture) {
const ui::PointerEvent touch_event(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(12, 13), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(touch_event,
+ dispatcher->ProcessEvent(touch_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
}
@@ -1175,7 +1181,7 @@ TEST_F(EventDispatcherTest, ExplicitCaptureOverridesImplicitCapture) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(15, 15), gfx::Point(15, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(press_event,
+ dispatcher->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Events should target the root.
@@ -1196,7 +1202,7 @@ TEST_F(EventDispatcherTest, CaptureUpdatesActivePointerTargets) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- dispatcher->ProcessEvent(press_event,
+ dispatcher->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1208,7 +1214,7 @@ TEST_F(EventDispatcherTest, CaptureUpdatesActivePointerTargets) {
const ui::PointerEvent touch_event(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, gfx::Point(12, 13), base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)));
- dispatcher->ProcessEvent(touch_event,
+ dispatcher->ProcessEvent(touch_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
}
@@ -1279,7 +1285,7 @@ TEST_F(EventDispatcherTest, CaptureInNonClientAreaOverridesActualPoint) {
const ui::PointerEvent press_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(6, 6), gfx::Point(6, 6),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(press_event,
+ event_dispatcher()->ProcessEvent(press_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
// Events should target child and be in the client area.
@@ -1301,7 +1307,7 @@ TEST_F(EventDispatcherTest, ProcessPointerEvents) {
ui::ET_MOUSE_PRESSED, gfx::Point(20, 25), gfx::Point(20, 25),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
event_dispatcher()->ProcessEvent(
- pointer_event, EventDispatcher::AcceleratorMatchPhase::ANY);
+ pointer_event, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
test_event_dispatcher_delegate()->GetAndAdvanceDispatchedEventDetails();
@@ -1323,7 +1329,7 @@ TEST_F(EventDispatcherTest, ProcessPointerEvents) {
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
touch_id)));
event_dispatcher()->ProcessEvent(
- pointer_event, EventDispatcher::AcceleratorMatchPhase::ANY);
+ pointer_event, 0, EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
test_event_dispatcher_delegate()->GetAndAdvanceDispatchedEventDetails();
@@ -1350,7 +1356,7 @@ TEST_F(EventDispatcherTest, ResetClearsPointerDown) {
const ui::PointerEvent ui_event(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(20, 25), gfx::Point(20, 25),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(ui_event,
+ event_dispatcher()->ProcessEvent(ui_event, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1394,7 +1400,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnModalParent) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(15, 15), gfx::Point(15, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1427,7 +1433,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnModalChild) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(55, 15), gfx::Point(55, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1463,7 +1469,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnUnrelatedWindow) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(75, 15), gfx::Point(75, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1500,7 +1506,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnDescendantOfModalParent) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(25, 25), gfx::Point(25, 25),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1529,7 +1535,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOnSystemModal) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(15, 15), gfx::Point(15, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1559,7 +1565,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventOutsideSystemModal) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(45, 15), gfx::Point(45, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
@@ -1609,7 +1615,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventSubWindowSystemModal) {
ui::PointerEvent(ui::TouchEvent(
ui::ET_TOUCH_PRESSED, kTouchData[i].location, base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0))),
- EventDispatcher::AcceleratorMatchPhase::ANY);
+ 0, EventDispatcher::AcceleratorMatchPhase::ANY);
std::unique_ptr<DispatchedEventDetails> details =
test_event_dispatcher_delegate()->GetAndAdvanceDispatchedEventDetails();
ASSERT_TRUE(details) << " details is nullptr " << i;
@@ -1620,7 +1626,7 @@ TEST_F(EventDispatcherTest, ModalWindowEventSubWindowSystemModal) {
ui::PointerEvent(ui::TouchEvent(
ui::ET_TOUCH_RELEASED, kTouchData[i].location, base::TimeTicks(),
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0))),
- EventDispatcher::AcceleratorMatchPhase::ANY);
+ 0, EventDispatcher::AcceleratorMatchPhase::ANY);
test_event_dispatcher_delegate()->GetAndAdvanceDispatchedEventDetails();
}
}
@@ -1737,7 +1743,7 @@ TEST_F(EventDispatcherTest, CaptureNotResetOnParentChange) {
const ui::PointerEvent mouse_pressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, gfx::Point(15, 15), gfx::Point(15, 15),
base::TimeTicks(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
- event_dispatcher()->ProcessEvent(mouse_pressed,
+ event_dispatcher()->ProcessEvent(mouse_pressed, 0,
EventDispatcher::AcceleratorMatchPhase::ANY);
event_dispatcher()->SetCaptureWindow(w11.get(), kClientAreaId);
@@ -1870,7 +1876,7 @@ TEST_F(EventDispatcherTest, MousePointerClearedOnDestroy) {
root_window()->SetBounds(gfx::Rect(0, 0, 100, 100));
c1->SetBounds(gfx::Rect(10, 10, 20, 20));
- event_dispatcher()->SetMousePointerScreenLocation(gfx::Point(15, 15));
+ event_dispatcher()->SetMousePointerDisplayLocation(gfx::Point(15, 15), 0);
EXPECT_EQ(c1.get(), event_dispatcher()->mouse_cursor_source_window());
c1.reset();
EXPECT_EQ(nullptr, event_dispatcher()->mouse_cursor_source_window());
« no previous file with comments | « services/ui/ws/event_dispatcher_delegate.h ('k') | services/ui/ws/platform_display_default.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698