Upstreamings parts of webkit.gyp (step 2)

webkit/webcore.gyp

 # Copyright (c) 2009 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.
 
 {
   'includes': [
     'features.gypi',
     '../third_party/WebKit/WebCore/WebCore.gypi',
   ],
   'variables': {
@@ skipping 84 matching lines @@
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'webcore',
       'type': '<(library)',
       'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
       'dependencies': [
-        'config.gyp:config',
         'javascriptcore.gyp:pcre',
         'javascriptcore.gyp:wtf',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../third_party/libjpeg/libjpeg.gyp:libjpeg',
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/sqlite/sqlite.gyp:sqlite',
       ],
       'defines': [
-        '<@(feature_defines)',
-        '<@(non_feature_defines)',
+        'WEBCORE_NAVIGATOR_VENDOR="Google Inc."', 
       ],
+      'conditions': [

[Ben Laurie (Chromium), 2009/09/23 21:42:26]

This duplicates the 'conditions' key below at line 578. One of them will hide
the other (found with the new --check flag, so proud).

+        ['OS=="linux"', {
+          'defines': [
+            # Mozilla on Linux effectively uses uname -sm, but when running
+            # 32-bit x86 code on an x86_64 processor, it uses
+            # "Linux i686 (x86_64)".  Matching that would require making a
+            # run-time determination.
+            'WEBCORE_NAVIGATOR_PLATFORM="Linux i686"',
+          ],
+        }],
+        ['OS=="mac"', {
+          'defines': [
+            # Match Safari and Mozilla on Mac x86.
+            'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"',
+
+            # Chromium's version of WebCore includes the following Objective-C
+            # classes. The system-provided WebCore framework may also provide
+            # these classes. Because of the nature of Objective-C binding
+            # (dynamically at runtime), it's possible for the Chromium-provided
+            # versions to interfere with the system-provided versions.  This may
+            # happen when a system framework attempts to use WebCore.framework,
+            # such as when converting an HTML-flavored string to an
+            # NSAttributedString.  The solution is to force Objective-C class
+            # names that would conflict to use alternate names.
+
+            # TODO(mark) This list will hopefully shrink but may also grow.
+            # Periodically run:
+            # nm libwebcore.a | grep -E '[atsATS] ([+-]\[|\.objc_class_name)'
+            # and make sure that everything listed there has the alternate
+            # ChromiumWebCoreObjC name, and that nothing extraneous is listed
+            # here. If all Objective-C can be eliminated from Chromium's WebCore
+            # library, these defines should be removed entirely.
+            # TODO(yaar) move these out of command line defines.
+            'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
+            'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
+            'WebFontCache=ChromiumWebCoreObjCWebFontCache',
+          ],
+        }],
+        ['OS=="win"', {
+          'defines': [
+            # Match Safari and Mozilla on Windows.
+            'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
+          ],
+          'dependencies': [
+            # Needed on windows for some actions and rules
+            '../build/win/system.gyp:cygwin'
+          ],
+        }],
+      ], 
       'actions': [
         # Actions to build derived sources.
         {
           'action_name': 'CSSPropertyNames',
           'inputs': [
             '../third_party/WebKit/WebCore/css/makeprop.pl',
             '../third_party/WebKit/WebCore/css/CSSPropertyNames.in',
             '../third_party/WebKit/WebCore/css/SVGCSSPropertyNames.in',
           ],
           'outputs': [
@@ skipping 328 matching lines @@
         '../third_party/WebKit/WebCore/platform/graphics/GraphicsLayer.cpp',
         '../third_party/WebKit/WebCore/platform/graphics/RenderLayerBacking.cpp',
         '../third_party/WebKit/WebCore/platform/graphics/RenderLayerCompositor.cpp',
 
         # We use a multi-process version from the WebKit API.
         '../third_party/WebKit/WebCore/dom/default/PlatformMessagePortChannel.cpp',
         '../third_party/WebKit/WebCore/dom/default/PlatformMessagePortChannel.h',
 
       ],
       'direct_dependent_settings': {
-        # webkit.gyp:webkit & glue need the same feature defines too
-        #'defines': [ 
-        #  '<@(feature_defines)',
-        #  '<@(non_feature_defines)',
-        #],
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/webkit',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
           '<@(webcore_include_dirs)',
         ],
         'mac_framework_dirs': [
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
       },
       'export_dependent_settings': [
@@ skipping 229 matching lines @@
         ['OS!="win"', {
           'sources/': [
             ['exclude', 'Win\\.cpp$'],
             ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
           ],
         }],
       ],
     },
   ], # targets
 }