Index: ui/aura/window_targeter.h |
diff --git a/ui/aura/window_targeter.h b/ui/aura/window_targeter.h |
index 9571f2ab32f70d982bd533af4ea540964d6dd01d..6d135e7bec889b730da5fae50f5ce8e90ed814a4 100644 |
--- a/ui/aura/window_targeter.h |
+++ b/ui/aura/window_targeter.h |
@@ -18,19 +18,38 @@ class AURA_EXPORT WindowTargeter : public ui::EventTargeter { |
~WindowTargeter() override; |
protected: |
+ // Same as FindTargetForEvent(), but used for positional events. The location |
+ // etc. of |event| are in |root|'s coordinate system. When finding the target |
+ // for the event, the targeter can mutate the |event| (e.g. change the |
+ // coordinate to be in the returned target's coordinate system) so that it can |
+ // be dispatched to the target without any further modification. |
+ virtual ui::EventTarget* FindTargetForLocatedEvent(ui::EventTarget* root, |
+ ui::LocatedEvent* event); |
+ |
+ // Returns false if neither |target| nor any of its descendants are allowed |
+ // to accept |event| for reasons unrelated to the event's location or the |
+ // target's bounds. For example, overrides of this function may consider |
+ // attributes such as the visibility or enabledness of |target|. Note that |
+ // the location etc. of |event| is in |target|'s parent's coordinate system. |
+ virtual bool SubtreeCanAcceptEvent(ui::EventTarget* target, |
+ const ui::LocatedEvent& event) const; |
+ |
+ // Returns whether the location of the event is in an actionable region of the |
+ // target. Note that the location etc. of |event| is in the |target|'s |
+ // parent's coordinate system. |
+ virtual bool EventLocationInsideBounds(ui::EventTarget* target, |
+ const ui::LocatedEvent& event) const; |
+ |
// ui::EventTargeter: |
ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, |
ui::Event* event) override; |
- ui::EventTarget* FindTargetForLocatedEvent(ui::EventTarget* root, |
- ui::LocatedEvent* event) override; |
- bool SubtreeCanAcceptEvent(ui::EventTarget* target, |
- const ui::LocatedEvent& event) const override; |
- bool EventLocationInsideBounds(ui::EventTarget* target, |
- const ui::LocatedEvent& event) const override; |
+ |
+ bool SubtreeShouldBeExploredForEvent(ui::EventTarget* target, |
+ const ui::LocatedEvent& event) override; |
private: |
- Window* FindTargetForKeyEvent(Window* root_window, |
- const ui::KeyEvent& event); |
+ Window* FindTargetForKeyEvent(Window* root_window, const ui::KeyEvent& event); |
+ Window* FindTargetForNonKeyEvent(Window* root_window, ui::Event* event); |
Window* FindTargetInRootWindow(Window* root_window, |
const ui::LocatedEvent& event); |