Only target ui::ET_GESTURE_END to the default gesture handler

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1955 matching lines @@
                      ui::GestureEventDetails(type, 0.0f, 0.0f)) {}
 
   GestureEventForTest(ui::GestureEventDetails details, int x, int y)
       : GestureEvent(x, y, 0, base::TimeDelta(), details) {}
 };
 
 // Tests that the |gesture_handler_| member in RootView is always NULL
 // after the dispatch of a ui::ET_GESTURE_END event corresponding to
 // the release of the final touch point on the screen and that
 // ui::ET_GESTURE_END events corresponding to the removal of any other touch
-// point  are never dispatched to a view. Also verifies that
+// point are never dispatched to a view. Also verifies that
 // ui::ET_GESTURE_BEGIN is never dispatched to a view and does not change the
 // value of |gesture_handler_|.
 TEST_F(WidgetTest, GestureBeginAndEndEvents) {
   Widget* widget = CreateTopLevelNativeWidget();
   widget->SetBounds(gfx::Rect(0, 0, 300, 300));
   EventCountView* view = new EventCountView();
   view->SetBounds(0, 0, 300, 300);
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget->GetRootView());
   root_view->AddChildView(view);
@@ skipping 31 matching lines @@
   // and should not be marked as handled because it is never dispatched.
   ui::GestureEventDetails details(ui::ET_GESTURE_END, 15, 15);
   details.set_touch_points(2);
   GestureEventForTest end_second_touch_point(details, 15, 15);
   widget->OnGestureEvent(&end_second_touch_point);
   EXPECT_FALSE(end_second_touch_point.handled());
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
 
   // If no gesture handler is set, dispatching only a ui::ET_GESTURE_END
   // event corresponding to the final touch point should not set the gesture
-  // handler, but it should be marked as handled because it was dispatched to
-  // the view targeted by the event's location.
+  // handler. Furthermore, it should not be marked as handled because it was
+  // not dispatched (GESTURE_END events are only dispatched in cases where
+  // a gesture handler is already set).
   end = GestureEventForTest(ui::ET_GESTURE_END, 15, 15);
   widget->OnGestureEvent(&end);
-  EXPECT_TRUE(end.handled());
+  EXPECT_FALSE(end.handled());
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
 
   // If the gesture handler has been set by a previous gesture, then it should
   // remain unchanged on a ui::ET_GESTURE_BEGIN or a ui::ET_GESTURE_END
   // corresponding to a second touch point. It should be reset to NULL by a
   // ui::ET_GESTURE_END corresponding to the final touch point.
   GestureEventForTest tap(ui::ET_GESTURE_TAP, 15, 15);
   widget->OnGestureEvent(&tap);
   EXPECT_TRUE(tap.handled());
   EXPECT_EQ(view, GetGestureHandler(root_view));
@@ skipping 337 matching lines @@
   widget->Show();
 
   // |v1|, |v2|, and |v3| all handle gesture events but |v3| is marked as
   // disabled.
   v1->set_handle_mode(EventCountView::CONSUME_EVENTS);
   v2->set_handle_mode(EventCountView::CONSUME_EVENTS);
   v3->set_handle_mode(EventCountView::CONSUME_EVENTS);
   v3->SetEnabled(false);
 
   // No gesture handler is set in the root view, so it should remain unset
-  // after a GESTURE_END. The event is first dispatched to |v4| (which does
-  // not want to handle the event) and is then targeted at |v3|. Since |v3|
-  // is disabled, the event is not dispatched but is still marked as handled.
+  // after a GESTURE_END. GESTURE_END events are not dispatched unless
+  // a gesture handler is already set in the root view, so none of the
+  // views should see this event and it should not be marked as handled.
   GestureEventForTest end(ui::ET_GESTURE_END, 5, 5);
   widget->OnGestureEvent(&end);
   EXPECT_EQ(0, v1->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(0, v3->GetEventCount(ui::ET_GESTURE_END));
-  EXPECT_EQ(1, v4->GetEventCount(ui::ET_GESTURE_END));
+  EXPECT_EQ(0, v4->GetEventCount(ui::ET_GESTURE_END));
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
-  EXPECT_TRUE(end.handled());
+  EXPECT_FALSE(end.handled());
   v1->ResetCounts();
   v2->ResetCounts();
   v3->ResetCounts();
   v4->ResetCounts();
 
   // No gesture handler is set in the root view. In this case the tap event
   // should be dispatched only to |v4|, the gesture handler should be set to
   // |v3|, and the event should be marked as handled.
   GestureEventForTest tap(ui::ET_GESTURE_TAP, 5, 5);
   widget->OnGestureEvent(&tap);
@@ skipping 677 matching lines @@
   EXPECT_EQ(3, view->GetEventCount(ui::ET_MOUSE_PRESSED));
   EXPECT_EQ(3, view->GetEventCount(ui::ET_MOUSE_RELEASED));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_MOUSE_DRAGGED));
   EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, view->last_flags());
 
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views