Unified Gesture Recognizer

ui/events/events.gyp

Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index fed04fb1b81e3dd85bdc03653059c9880df195e7..4be4314faf776e83dbd24ffab3daaeb2daed2cdf 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -39,6 +39,8 @@
         'events_base_export.h',
         'gesture_event_details.cc',
         'gesture_event_details.h',
+        'gestures/gesture_configuration.cc',
+        'gestures/gesture_configuration.h',
         'keycodes/keyboard_code_conversion.cc',
         'keycodes/keyboard_code_conversion.h',
         'keycodes/keyboard_code_conversion_android.cc',
@@ -78,6 +80,7 @@
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         'events_base',
+        'gesture_detection',
       ],
       'defines': [
         'EVENTS_IMPLEMENTATION',
@@ -106,16 +109,18 @@
         'event_utils.h',
         'events_export.h',
         'events_stub.cc',
-        'gestures/gesture_configuration.cc',
-        'gestures/gesture_configuration.h',
         'gestures/gesture_point.cc',
         'gestures/gesture_point.h',
+        'gestures/gesture_provider_aura.cc',
+        'gestures/gesture_provider_aura.h',
         'gestures/gesture_recognizer.h',
         'gestures/gesture_recognizer_impl.cc',
         'gestures/gesture_recognizer_impl.h',
         'gestures/gesture_sequence.cc',
         'gestures/gesture_sequence.h',
         'gestures/gesture_types.h',
+        'gestures/motion_event_aura.cc',
+        'gestures/motion_event_aura.h',
         'gestures/velocity_calculator.cc',
         'gestures/velocity_calculator.h',
         'ozone/device/device_event.cc',
@@ -253,6 +258,9 @@
         'gesture_detection/bitset_32.h',
         'gesture_detection/filtered_gesture_provider.cc',
         'gesture_detection/filtered_gesture_provider.h',
+        'gesture_detection/gesture_config_helper.h',
+        'gesture_detection/gesture_config_helper_android.cc',
+        'gesture_detection/gesture_config_helper_aura.cc',
         'gesture_detection/gesture_detection_export.h',
         'gesture_detection/gesture_detector.cc',
         'gesture_detection/gesture_detector.h',
@@ -260,9 +268,6 @@
         'gesture_detection/gesture_event_data.h',
         'gesture_detection/gesture_event_data_packet.cc',
         'gesture_detection/gesture_event_data_packet.h',
-        'gesture_detection/gesture_config_helper.h',
-        'gesture_detection/gesture_config_helper_aura.cc',
-        'gesture_detection/gesture_config_helper_android.cc',
         'gesture_detection/gesture_provider.cc',
         'gesture_detection/gesture_provider.h',
         'gesture_detection/motion_event.h',
@@ -278,11 +283,6 @@
         'gesture_detection/velocity_tracker.h',
       ],
       'conditions': [
-        ['use_aura==1', {
-          'dependencies': [
-            'events'
-          ],
-        }],
         ['use_aura!=1 and OS!="android"', {
           'sources': [
             'gesture_detection/gesture_config_helper.cc',
@@ -327,6 +327,27 @@
       ],
     },
     {
+      'target_name': 'events_tests',

[tdresser, 2014/05/05 18:56:06]

I could split out events_base_tests and gesture_detection_tests, but I don't see
much point.

Does this seem reasonable?

+      'type': '<(component)',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        'events',
+        'events_test_support',
+      ],
+      'sources': [
+        'event_dispatcher_unittest.cc',
+        'event_processor_unittest.cc',
+        'event_rewriter_unittest.cc',
+        'event_unittest.cc',
+        'gestures/motion_event_aura_unittest.cc',
+        'gestures/velocity_calculator_unittest.cc',
+        'keycodes/dom4/keycode_converter_unittest.cc',
+        'platform/platform_event_source_unittest.cc',
+        'x/events_x_unittest.cc',
+      ],
+    },
+    {
       'target_name': 'events_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -337,30 +358,21 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../gfx/gfx.gyp:gfx_test_support',
         'dom4_keycode_converter',
-        'events',
         'events_base',
-        'events_test_support',
-        'gesture_detection'
+        'gesture_detection',
+        'events_tests',
       ],
       'sources': [
         'cocoa/events_mac_unittest.mm',
-        'event_dispatcher_unittest.cc',
-        'event_processor_unittest.cc',
-        'event_rewriter_unittest.cc',
-        'event_unittest.cc',
-        'gestures/velocity_calculator_unittest.cc',
         'gesture_detection/bitset_32_unittest.cc',
         'gesture_detection/gesture_provider_unittest.cc',
-        'gesture_detection/mock_motion_event.h',
         'gesture_detection/mock_motion_event.cc',
-        'gesture_detection/velocity_tracker_unittest.cc',
+        'gesture_detection/mock_motion_event.h',
         'gesture_detection/touch_disposition_gesture_filter_unittest.cc',
-        'keycodes/dom4/keycode_converter_unittest.cc',
+        'gesture_detection/velocity_tracker_unittest.cc',
         'latency_info_unittest.cc',
         'ozone/evdev/key_event_converter_evdev_unittest.cc',
         'ozone/evdev/touch_event_converter_evdev_unittest.cc',
-        'platform/platform_event_source_unittest.cc',
-        'x/events_x_unittest.cc',
       ],
       'conditions': [
         # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
@@ -381,6 +393,11 @@
             '../../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
+        ['OS == "android"', {
+          'dependencies!': [
+            'events_tests',
+          ],
+        }],
       ],
     },
   ],