Merge 270252 "Re-land "Move touch CTM from X into Chrome""

ui/events/events.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'dom4_keycode_converter',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
       ],
       'sources': [
         'keycodes/dom4/keycode_converter.cc',
         'keycodes/dom4/keycode_converter.h',
         'keycodes/dom4/keycode_converter_data.h',
       ],
     },
     {
       'target_name': 'events_base',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         'dom4_keycode_converter',
       ],
       'defines': [
         'EVENTS_BASE_IMPLEMENTATION',
       ],
       'sources': [
         'event_constants.h',
         'event_switches.cc',
@@ skipping 267 matching lines @@
           'sources': [
             'gesture_detection/gesture_config_helper.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'events_test_support',
       'type': 'static_library',
       'dependencies': [
+        '<(DEPTH)/skia/skia.gyp:skia',
         'events',
         'events_base',
       ],
       'sources': [
         'test/cocoa_test_event_utils.h',
         'test/cocoa_test_event_utils.mm',
         'test/events_test_utils.cc',
         'test/events_test_utils.h',
         'test/events_test_utils_x11.cc',
         'test/events_test_utils_x11.h',
@@ skipping 19 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'events_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/base/base.gyp:test_support_base',
+        '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '../gfx/gfx.gyp:gfx_geometry',
         '../gfx/gfx.gyp:gfx_test_support',
         'dom4_keycode_converter',
         'events',
         'events_base',
         'events_test_support',
         'gesture_detection',
       ],
       'sources': [
@@ skipping 58 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'events_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }