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

Unified Diff: ui/events/event_targeter.cc

Issue 98353008: events: Update EventTargeter to operate on the EventTarget that owns the targeter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years 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 | « ui/events/event_processor_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event_targeter.cc
diff --git a/ui/events/event_targeter.cc b/ui/events/event_targeter.cc
index 41d44426596cee34473be261c1e43741314919d1..50fe7e92051814b2d7d7c6996e1571aa1c1ac1c4 100644
--- a/ui/events/event_targeter.cc
+++ b/ui/events/event_targeter.cc
@@ -32,16 +32,18 @@ EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root,
EventTarget* target = root;
EventTarget* child = NULL;
while ((child = iter->GetNextTarget())) {
- if (!SubtreeShouldBeExploredForEvent(child, *event))
+ EventTargeter* targeter = child->GetEventTargeter();
+ if (!targeter)
+ targeter = this;
+ if (!targeter->SubtreeShouldBeExploredForEvent(child, *event))
continue;
target->ConvertEventToTarget(child, event);
- EventTargeter* targeter = child->GetEventTargeter();
+ target = child;
EventTarget* child_target = targeter ?
targeter->FindTargetForLocatedEvent(child, event) :
FindTargetForLocatedEvent(child, event);
if (child_target)
return child_target;
- target = child;
}
target->ConvertEventToTarget(root, event);
}
« no previous file with comments | « ui/events/event_processor_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698