Move the WebCursor sources from webkit/glue to webkit/common/cursors.

webkit/glue/webkit_glue.gypi

 # 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.
 
 {
   'target_defaults': {
      # Disable narrowing-conversion-in-initialization-list warnings in that we
      # do not want to fix it in data file "webcursor_gtk_data.h".
      'cflags+': ['-Wno-narrowing'],
      'cflags_cc+': ['-Wno-narrowing'],
@@ skipping 66 matching lines @@
 
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
 
       'sources': [
         'multipart_response_delegate.cc',
         'multipart_response_delegate.h',
-        'webcursor.cc',
-        'webcursor.h',
-        'webcursor_android.cc',
-        'webcursor_aura.cc',
-        'webcursor_aurawin.cc',
-        'webcursor_aurax11.cc',
-        'webcursor_null.cc',
-        'webcursor_gtk.cc',
-        'webcursor_gtk_data.h',
-        'webcursor_mac.mm',
-        'webcursor_win.cc',
         'weburlrequest_extradata_impl.cc',
         'weburlrequest_extradata_impl.h',
         'weburlresponse_extradata_impl.cc',
         'weburlresponse_extradata_impl.h',
       ],
 
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
           'sources/': [['exclude', '_x11\\.cc$']],
         }],
-        ['use_aura==1', {
-          'sources!': [
-            'webcursor_mac.mm',
-            'webcursor_win.cc',
-          ],
-        }],
-        ['use_aura==1 and use_x11==1', {
-          'link_settings': {
-            'libraries': [ '-lXcursor', ],
-          },
-        }],
-        ['use_ozone==0', {
-          'sources!': [
-            'webcursor_null.cc',
-          ],
-        }],
         ['OS!="mac"', {
           'sources/': [['exclude', '_mac\\.(cc|mm)$']],
         }, {  # else: OS=="mac"
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
             ],
           },
         }],
         ['OS!="win"', {
@@ skipping 63 matching lines @@
         '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         'glue_common',
         'plugins_common',
         'plugins',
         'user_agent',
         'webkit_base',
+        'webkit_common',
         'webkit_media',
         'webkit_resources',
         'webkit_storage',
         'webkit_strings',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
@@ skipping 172 matching lines @@
           'variables': {
             'jni_gen_package': 'webkit',
             'input_java_class': 'android/widget/OverScroller.class',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }