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

Side by Side Diff: ui/events/event_targeter.cc

Issue 1119423003: Refactors away method implementations in ui::EventTargeter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactors away method implementations in ui::EventTargeter (moves tests to aura) Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/events/event_targeter.h" 5 #include "ui/events/event_targeter.h"
6 6
7 #include "ui/events/event.h" 7 #include "ui/events/event.h"
8 #include "ui/events/event_target.h" 8 #include "ui/events/event_target.h"
9 #include "ui/events/event_target_iterator.h" 9 #include "ui/events/event_target_iterator.h"
10 10
11 namespace ui { 11 namespace ui {
12 12
13 EventTargeter::~EventTargeter() { 13 EventTargeter::~EventTargeter() {
14 } 14 }
15 15
16 EventTarget* EventTargeter::FindTargetForEvent(EventTarget* root, 16 EventTarget* EventTargeter::FindTargetForEvent(EventTarget* root,
17 Event* event) { 17 Event* event) {
18 if (event->IsMouseEvent() || 18 if (!event->IsLocatedEvent())
19 event->IsScrollEvent() || 19 return root;
20 event->IsTouchEvent() || 20 LocatedEvent* located_event = static_cast<LocatedEvent*>(event);
21 event->IsGestureEvent()) {
22 return FindTargetForLocatedEvent(root,
23 static_cast<LocatedEvent*>(event));
24 }
25 return root;
26 }
27 21
28 EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root,
29 LocatedEvent* event) {
30 scoped_ptr<EventTargetIterator> iter = root->GetChildIterator(); 22 scoped_ptr<EventTargetIterator> iter = root->GetChildIterator();
31 if (iter) { 23 if (iter) {
32 EventTarget* target = root; 24 EventTarget* target = root;
33 for (EventTarget* child = iter->GetNextTarget(); child; 25 for (EventTarget* child = iter->GetNextTarget(); child;
34 child = iter->GetNextTarget()) { 26 child = iter->GetNextTarget()) {
35 EventTargeter* targeter = child->GetEventTargeter(); 27 EventTargeter* targeter = child->GetEventTargeter();
36 if (!targeter) 28 if (!targeter)
37 targeter = this; 29 targeter = this;
38 if (!targeter->SubtreeShouldBeExploredForEvent(child, *event)) 30 target->ConvertEventToTarget(child, located_event);
39 continue;
40 target->ConvertEventToTarget(child, event);
41 target = child; 31 target = child;
42 EventTarget* child_target = 32 EventTarget* child_target =
43 targeter->FindTargetForLocatedEvent(child, event); 33 targeter->FindTargetForEvent(child, located_event);
44 if (child_target) 34 if (child_target)
45 return child_target; 35 return child_target;
46 } 36 }
47 target->ConvertEventToTarget(root, event); 37 target->ConvertEventToTarget(root, located_event);
48 } 38 }
49 return root->CanAcceptEvent(*event) ? root : NULL; 39 return root->CanAcceptEvent(*event) ? root : NULL;
50 } 40 }
51 41
52 bool EventTargeter::SubtreeShouldBeExploredForEvent(EventTarget* target,
53 const LocatedEvent& event) {
54 return SubtreeCanAcceptEvent(target, event) &&
55 EventLocationInsideBounds(target, event);
56 }
57
58 EventTarget* EventTargeter::FindNextBestTarget(EventTarget* previous_target, 42 EventTarget* EventTargeter::FindNextBestTarget(EventTarget* previous_target,
59 Event* event) { 43 Event* event) {
60 return NULL; 44 return NULL;
61 } 45 }
62 46
63 bool EventTargeter::SubtreeCanAcceptEvent(EventTarget* target,
64 const LocatedEvent& event) const {
65 return true;
66 }
67
68 bool EventTargeter::EventLocationInsideBounds(EventTarget* target,
69 const LocatedEvent& event) const {
70 return true;
71 }
72
73 } // namespace ui 47 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698