Wires up ShouldDescendIntoChildForEventHandling() for DesktopNativeWidgetAura

ui/views/widget/native_widget_aura_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 499 matching lines @@
 
   EXPECT_EQ(child->GetNativeWindow(),
             parent->GetNativeWindow()->GetEventHandlerForPoint(
                 gfx::Point(20, 20)));
 
   // Work around for bug in NativeWidgetAura.
   // TODO: fix bug and remove this.
   parent->Close();
 }
 
+// Verifies views with layers are targeted for events properly.
+TEST_F(NativeWidgetAuraTest,
+       ShouldDescendIntoChildForEventHandlingChecksVisibleBounds) {
+  // Create two widgets: |parent| and |child|. |child| is a child of |parent|.
+  View* parent_root_view = new View;
+  Widget parent;
+  Widget::InitParams parent_params(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+  parent_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  parent_params.context = root_window();
+  parent.Init(parent_params);
+  parent.SetContentsView(parent_root_view);
+  parent.SetBounds(gfx::Rect(0, 0, 400, 400));
+  parent.Show();
+
+  Widget child;
+  Widget::InitParams child_params(Widget::InitParams::TYPE_CONTROL);
+  child_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  child_params.parent = parent.GetNativeWindow();
+  child.Init(child_params);
+  child.SetBounds(gfx::Rect(0, 0, 200, 200));
+  child.Show();
+
+  // Point is over |child|.
+  EXPECT_EQ(
+      child.GetNativeWindow(),
+      parent.GetNativeWindow()->GetEventHandlerForPoint(gfx::Point(50, 50)));
+
+  View* parent_root_view_child = new View;
+  parent_root_view->AddChildView(parent_root_view_child);
+  parent_root_view_child->SetBounds(0, 0, 10, 10);
+
+  // Create a View whose layer extends outside the bounds of its parent. Event
+  // targetting should only consider the visible bounds.
+  View* parent_root_view_child_child = new View;
+  parent_root_view_child->AddChildView(parent_root_view_child_child);
+  parent_root_view_child_child->SetBounds(0, 0, 100, 100);
+  parent_root_view_child_child->SetPaintToLayer();
+  parent_root_view_child_child->layer()->parent()->StackAtTop(
+      parent_root_view_child_child->layer());
+
+  // 20,20 is over |parent_root_view_child_child|'s layer, but not the visible
+  // bounds of |parent_root_view_child_child|, so |child| should be the event
+  // target.
+  EXPECT_EQ(
+      child.GetNativeWindow(),
+      parent.GetNativeWindow()->GetEventHandlerForPoint(gfx::Point(20, 20)));
+}
+
 // Verifies that widget->FlashFrame() sets aura::client::kDrawAttentionKey,
 // and activating the window clears it.
 TEST_F(NativeWidgetAuraTest, FlashFrame) {
   std::unique_ptr<Widget> widget(new Widget());
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.context = root_window();
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   aura::Window* window = widget->GetNativeWindow();
   EXPECT_FALSE(window->GetProperty(aura::client::kDrawAttentionKey));
@@ skipping 67 matching lines @@
   EXPECT_FALSE(delegate.view()->HasFocus());
 
   test_focus_rules()->set_can_activate(true);
   views::test::TestInitialFocusWidgetDelegate delegate2(root_window());
   delegate2.GetWidget()->Show();
   EXPECT_TRUE(delegate2.view()->HasFocus());
 }
 
 }  // namespace
 }  // namespace views