| Index: ui/aura/window.cc
|
| diff --git a/ui/aura/window.cc b/ui/aura/window.cc
|
| index f085a86a81a83921c028fd9e13d381539df8034a..e38a63af9980b68cf5ddb83a0497630ec2139bbf 100644
|
| --- a/ui/aura/window.cc
|
| +++ b/ui/aura/window.cc
|
| @@ -728,23 +728,11 @@ Window* Window::GetWindowForPoint(const gfx::Point& local_point,
|
| bool return_tightest,
|
| bool for_event_handling) {
|
| if (!IsVisible())
|
| - return NULL;
|
| + return nullptr;
|
|
|
| if ((for_event_handling && !HitTest(local_point)) ||
|
| - (!for_event_handling && !ContainsPoint(local_point)))
|
| - return NULL;
|
| -
|
| - // Check if I should claim this event and not pass it to my children because
|
| - // the location is inside my hit test override area. For details, see
|
| - // set_hit_test_bounds_override_inner().
|
| - if (for_event_handling && !hit_test_bounds_override_inner_.IsEmpty()) {
|
| - gfx::Rect inset_local_bounds(gfx::Point(), bounds().size());
|
| - inset_local_bounds.Inset(hit_test_bounds_override_inner_);
|
| - // We know we're inside the normal local bounds, so if we're outside the
|
| - // inset bounds we must be in the special hit test override area.
|
| - DCHECK(HitTest(local_point));
|
| - if (!inset_local_bounds.Contains(local_point))
|
| - return delegate_ ? this : NULL;
|
| + (!for_event_handling && !ContainsPoint(local_point))) {
|
| + return nullptr;
|
| }
|
|
|
| if (!return_tightest && delegate_)
|
| @@ -758,13 +746,16 @@ Window* Window::GetWindowForPoint(const gfx::Point& local_point,
|
| if (for_event_handling) {
|
| if (child->ignore_events_)
|
| continue;
|
| +
|
| // The client may not allow events to be processed by certain subtrees.
|
| client::EventClient* client = client::GetEventClient(GetRootWindow());
|
| if (client && !client->CanProcessEventsWithinSubtree(child))
|
| continue;
|
| +
|
| if (delegate_ && !delegate_->ShouldDescendIntoChildForEventHandling(
|
| - child, local_point))
|
| + child, local_point)) {
|
| continue;
|
| + }
|
| }
|
|
|
| gfx::Point point_in_child_coords(local_point);
|
| @@ -776,7 +767,7 @@ Window* Window::GetWindowForPoint(const gfx::Point& local_point,
|
| return match;
|
| }
|
|
|
| - return delegate_ ? this : NULL;
|
| + return delegate_ ? this : nullptr;
|
| }
|
|
|
| void Window::RemoveChildImpl(Window* child, Window* new_parent) {
|
|
|