ash: Stop propagation of gesture events when drag drop is in progress.

ash/drag_drop/drag_drop_controller_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 "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 268 matching lines @@
       gesture_type,
       location.x(),
       location.y(),
       0,
       ui::EventTimeForNow(),
       ui::GestureEventDetails(gesture_type, 0, 0),
       1);
   Shell::GetPrimaryRootWindow()->DispatchGestureEvent(&gesture_event);
 }
 
+bool IsGestureEventType(ui::EventType type) {
+  switch (type) {
+    case ui::ET_GESTURE_SCROLL_BEGIN:
+    case ui::ET_GESTURE_SCROLL_END:
+    case ui::ET_GESTURE_SCROLL_UPDATE:
+    case ui::ET_GESTURE_TAP:
+    case ui::ET_GESTURE_TAP_CANCEL:
+    case ui::ET_GESTURE_TAP_DOWN:
+    case ui::ET_GESTURE_BEGIN:
+    case ui::ET_GESTURE_END:
+    case ui::ET_GESTURE_TWO_FINGER_TAP:
+    case ui::ET_GESTURE_PINCH_BEGIN:
+    case ui::ET_GESTURE_PINCH_END:
+    case ui::ET_GESTURE_PINCH_UPDATE:
+    case ui::ET_GESTURE_LONG_PRESS:
+    case ui::ET_GESTURE_LONG_TAP:
+    case ui::ET_GESTURE_MULTIFINGER_SWIPE:
+    case ui::ET_SCROLL_FLING_CANCEL:
+    case ui::ET_SCROLL_FLING_START:
+      return true;
+    default:
+      break;
+  }
+  return false;
+}
+
 }  // namespace
 
 class DragDropControllerTest : public AshTestBase {
  public:
   DragDropControllerTest() : AshTestBase() {}
   virtual ~DragDropControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     drag_drop_controller_.reset(new TestDragDropController);
@@ skipping 842 matching lines @@
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
 
   // Since dragging has started, |handler| should not receive unhandled events.
   UpdateDragData(&data);
   gfx::Point gesture_location = point;
   int num_drags = drag_view->width();
   for (int i = 0; i < num_drags; ++i) {
     gesture_location.Offset(1, 0);
     handler.Reset();
     DispatchGesture(ui::ET_GESTURE_SCROLL_UPDATE, gesture_location);
-    EXPECT_TRUE(handler.handled_event_received());
+    EXPECT_FALSE(handler.handled_event_received());
     EXPECT_FALSE(handler.unhandled_event_received());
 
     // Execute any scheduled draws to process deferred mouse events.
+    RunAllPendingInMessageLoop();
+  }
+
+  // Handler should not receive any other gestures that DragDropController
+  // does not care about.
+  std::set<ui::EventType> drag_drop_gestures;
+  drag_drop_gestures.insert(ui::ET_GESTURE_SCROLL_UPDATE);
+  drag_drop_gestures.insert(ui::ET_GESTURE_SCROLL_END);
+  drag_drop_gestures.insert(ui::ET_GESTURE_LONG_TAP);
+  drag_drop_gestures.insert(ui::ET_SCROLL_FLING_START);
+  for (ui::EventType type = ui::ET_UNKNOWN; type < ui::ET_LAST;
+      type = static_cast<ui::EventType>(type + 1)) {
+    if (!IsGestureEventType(type) ||
+        drag_drop_gestures.find(type) != drag_drop_gestures.end())
+      continue;
+
+    handler.Reset();
+    DispatchGesture(ui::ET_GESTURE_SCROLL_UPDATE, gesture_location);
+    EXPECT_FALSE(handler.handled_event_received());
+    EXPECT_FALSE(handler.unhandled_event_received());
+
+    // Execute any scheduled draws to process deferred mouse events.
     RunAllPendingInMessageLoop();
   }
 
   // End dragging.
   DispatchGesture(ui::ET_GESTURE_SCROLL_END, gesture_location);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
 }
 
 }  // namespace test
 }  // namespace aura