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

webkit/common/webkit_common.gypi

Index: webkit/common/webkit_common.gypi
===================================================================
--- webkit/common/webkit_common.gypi	(revision 202599)
+++ webkit/common/webkit_common.gypi	(working copy)
@@ -15,4 +15,83 @@
       '<@(webkit_common_fileapi_sources)',
     ],
   },
+
+  'targets': [
+    {
+      'target_name': 'webkit_common',
+      'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'WEBKIT_COMMON_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/ui/ui.gyp:ui',
+        '<(DEPTH)/ui/ui.gyp:ui_resources',
+      ],
+
+      'include_dirs': [
+        '<(INTERMEDIATE_DIR)',
+        '<(SHARED_INTERMEDIATE_DIR)/ui',
+      ],
+
+      'sources': [
+        'cursors\webcursor.cc',

[jamesr, 2013/05/29 00:28:11]

i think we always use forward slashes for paths inside gyp files

[ananta, 2013/05/29 00:34:44]

Done.

+        'cursors\webcursor.h',
+        'cursors\webcursor_android.cc',
+        'cursors\webcursor_aura.cc',
+        'cursors\webcursor_aurawin.cc',
+        'cursors\webcursor_aurax11.cc',
+        'cursors\webcursor_null.cc',
+        'cursors\webcursor_gtk.cc',
+        'cursors\webcursor_gtk_data.h',
+        'cursors\webcursor_mac.mm',
+        'cursors\webcursor_win.cc',
+      ],
+
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:gtk',
+          ],
+          'sources/': [['exclude', '_x11\\.cc$']],
+        }],
+        ['use_aura==1', {
+          'sources!': [
+            'cursors/webcursor_mac.mm',
+            'cursors/webcursor_win.cc',
+          ],
+        }],
+        ['use_aura==1 and use_x11==1', {
+          'link_settings': {
+            'libraries': [ '-lXcursor', ],
+          },
+        }],
+        ['use_ozone==0', {
+          'sources!': [
+            'cursors/webcursor_null.cc',
+          ],
+        }],
+        ['OS!="mac"', {
+          'sources/': [['exclude', '_mac\\.(cc|mm)$']],
+        }, {  # else: OS=="mac"
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+            ],
+          },
+        }],
+        ['OS!="win"', {
+          'sources/': [['exclude', '_win\\.cc$']],
+        }, {  # else: OS=="win"
+          'sources/': [['exclude', '_posix\\.cc$']],
+        }],
+      ],
+    },
+  ],
 }
Property changes on: webkit\common\webkit_common.gypi
___________________________________________________________________
Added: svn:eol-style
   + LF