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

Side by Side Diff: services/ui/ws/event_targeter.cc

Issue 2911293002: Add EventTargeterDelegate for EventTargeter in mus-ws. (Closed)
Patch Set: Created 3 years, 6 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 unified diff | Download patch
« no previous file with comments | « services/ui/ws/event_targeter.h ('k') | services/ui/ws/event_targeter_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "services/ui/ws/event_targeter.h" 5 #include "services/ui/ws/event_targeter.h"
6 6
7 #include "services/ui/ws/event_dispatcher_delegate.h" 7 #include "services/ui/ws/event_targeter_delegate.h"
8 #include "services/ui/ws/modal_window_controller.h" 8 #include "services/ui/ws/modal_window_controller.h"
9 #include "services/ui/ws/window_finder.h" 9 #include "services/ui/ws/window_finder.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
11 #include "ui/gfx/geometry/point.h" 11 #include "ui/gfx/geometry/point.h"
12 12
13 namespace ui { 13 namespace ui {
14 namespace ws { 14 namespace ws {
15 15
16 EventTargeter::EventTargeter(EventDispatcherDelegate* event_dispatcher_delegate, 16 EventTargeter::EventTargeter(EventTargeterDelegate* event_targeter_delegate,
17 ModalWindowController* modal_window_controller) 17 ModalWindowController* modal_window_controller)
18 : event_dispatcher_delegate_(event_dispatcher_delegate), 18 : event_targeter_delegate_(event_targeter_delegate),
19 modal_window_controller_(modal_window_controller) {} 19 modal_window_controller_(modal_window_controller) {}
20 20
21 EventTargeter::~EventTargeter() {} 21 EventTargeter::~EventTargeter() {}
22 22
23 PointerTarget EventTargeter::PointerTargetForEvent( 23 PointerTarget EventTargeter::PointerTargetForEvent(
24 const ui::LocatedEvent& event, 24 const ui::LocatedEvent& event,
25 int64_t* display_id) { 25 int64_t* display_id) {
26 PointerTarget pointer_target; 26 PointerTarget pointer_target;
27 gfx::Point event_root_location(event.root_location()); 27 gfx::Point event_root_location(event.root_location());
28 DeepestWindow deepest_window = 28 DeepestWindow deepest_window =
29 FindDeepestVisibleWindowForEvents(&event_root_location, display_id); 29 FindDeepestVisibleWindowForEvents(&event_root_location, display_id);
30 pointer_target.window = 30 pointer_target.window =
31 modal_window_controller_->GetTargetForWindow(deepest_window.window); 31 modal_window_controller_->GetTargetForWindow(deepest_window.window);
32 pointer_target.is_mouse_event = event.IsMousePointerEvent(); 32 pointer_target.is_mouse_event = event.IsMousePointerEvent();
33 pointer_target.in_nonclient_area = 33 pointer_target.in_nonclient_area =
34 deepest_window.window != pointer_target.window || 34 deepest_window.window != pointer_target.window ||
35 !pointer_target.window || deepest_window.in_non_client_area; 35 !pointer_target.window || deepest_window.in_non_client_area;
36 pointer_target.is_pointer_down = event.type() == ui::ET_POINTER_DOWN; 36 pointer_target.is_pointer_down = event.type() == ui::ET_POINTER_DOWN;
37 return pointer_target; 37 return pointer_target;
38 } 38 }
39 39
40 DeepestWindow EventTargeter::FindDeepestVisibleWindowForEvents( 40 DeepestWindow EventTargeter::FindDeepestVisibleWindowForEvents(
41 gfx::Point* location, 41 gfx::Point* location,
42 int64_t* display_id) { 42 int64_t* display_id) {
43 ServerWindow* root = 43 ServerWindow* root =
44 event_dispatcher_delegate_->GetRootWindowContaining(location, display_id); 44 event_targeter_delegate_->GetRootWindowContaining(location, display_id);
45 return root ? ui::ws::FindDeepestVisibleWindowForEvents(root, *location) 45 return root ? ui::ws::FindDeepestVisibleWindowForEvents(root, *location)
46 : DeepestWindow(); 46 : DeepestWindow();
47 } 47 }
48 48
49 } // namespace ws 49 } // namespace ws
50 } // namespace ui 50 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/event_targeter.h ('k') | services/ui/ws/event_targeter_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698