Bring config.h.in up to date.

webkit/webkit.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.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_DATABASE=1',
       'ENABLE_DATAGRID=0',
@@ skipping 13 matching lines @@
       'ENABLE_SVG_USE=1',
       'ENABLE_SVG_FOREIGN_OBJECT=1',
       'ENABLE_SVG_FONTS=1',
       'ENABLE_VIDEO=1',
       'ENABLE_WORKERS=1',
     ],
     'non_feature_defines': [
       'BUILDING_CHROMIUM__=1',
       'USE_GOOGLE_URL_LIBRARY=1',
       'USE_SYSTEM_MALLOC=1',
+      'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
     ],
     'webcore_include_dirs': [
       '../third_party/WebKit/WebCore/accessibility',
       '../third_party/WebKit/WebCore/accessibility/chromium',
       '../third_party/WebKit/WebCore/bindings/v8',
       '../third_party/WebKit/WebCore/bindings/v8/custom',
       '../third_party/WebKit/WebCore/bridge',
       '../third_party/WebKit/WebCore/css',
       '../third_party/WebKit/WebCore/dom',
       '../third_party/WebKit/WebCore/dom/default',
@@ skipping 51 matching lines @@
           # run-time determination.
           'WEBCORE_NAVIGATOR_PLATFORM="Linux i686"',
         ],
       }],
       ['OS=="mac"', {
         'non_feature_defines': [
           # Ensure that only Leopard features are used when doing the Mac build.
           'BUILDING_ON_LEOPARD',
           # 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',
         ],
         'webcore_include_dirs+': [
           # platform/graphics/cg and mac needs to come before
           # platform/graphics/chromium so that the Mac build picks up the
           # version of ImageBufferData.h in the cg directory and
           # FontPlatformData.h in the mac directory.  The + prepends this
           # directory to the list.
           # TODO(port): This shouldn't need to be prepended.
           # TODO(port): Eliminate dependency on platform/graphics/mac and
           # related directories.
@@ skipping 1487 matching lines @@
           'product_dir': '<(PRODUCT_DIR)',
           'type': 'loadable_module',
           'sources': [
             'tools/libxul_hack/libxul_hack.cc'
           ],
         },
       ], # targets
     }],
   ], # conditions
 }