Finish removing WebKitSystemInterface from Blink.

Source/core/core.gyp/core.gyp

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
      'optimize': 'size',
     },
 
     'msvs_settings': {
       'VCCLCompilerTool': {
         'AdditionalOptions': ['/bigobj'],
       },
     },
   },
 
-  'conditions': [
-    ['OS == "mac"', {
-      'targets': [
-        {
-          # On the Mac, libWebKitSystemInterface*.a is used to help WebCore
-          # interface with the system.  This library is supplied as a static
-          # library in binary format.  At present, it contains many global
-          # symbols not marked private_extern.  It should be considered an
-          # implementation detail of WebCore, and does not need these symbols
-          # to be exposed so widely.
-          #
-          # This target contains an action that cracks open the existing
-          # static library and rebuilds it with these global symbols
-          # transformed to private_extern.
-          'target_name': 'webkit_system_interface',
-          'type': 'none',
-          'variables': {
-            'adjusted_library_path':
-                '<(PRODUCT_DIR)/libWebKitSystemInterfaceLeopardPrivateExtern.a',
-          },
-          'actions': [
-            {
-              'action_name': 'Adjust Visibility',
-              'inputs': [
-                'mac/adjust_visibility.sh',
-                '<(DEPTH)/third_party/apple_webkit/libWebKitSystemInterfaceLeopard.a',
-              ],
-              'outputs': [
-                '<(adjusted_library_path)',
-              ],
-              'action': [
-                '<@(_inputs)',
-                '<@(_outputs)',
-                '<(INTERMEDIATE_DIR)/adjust_visibility',  # work directory
-              ],
-            },
-          ],  # actions
-          'link_settings': {
-            'libraries': [
-              '<(adjusted_library_path)',
-
-              # libWebKitSystemInterfaceLeopard.a references _kCIFormatRGBA8.
-              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-            ],
-          },  # link_settings
-        },  # target webkit_system_interface
-      ],  # targets
-    }],  # condition OS == "mac"
-  ],  # conditions
-
   'targets': [
     {
       'target_name': 'inspector_protocol_sources',
       'type': 'none',
       'dependencies': [
         'generate_inspector_protocol_version'
       ],
       'actions': [
         {
           'action_name': 'generateInspectorProtocolBackendSources',
@@ skipping 199 matching lines @@
             'USING_V8_SHARED',
           ],
         }],
         # TODO(maruel): Move it in its own project or generate it anyway?
         ['enable_svg!=0', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/V8SVGElementWrapperFactory.cpp',
          ],
         }],
-        ['OS=="mac"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/apple_webkit',
-          ],
-        }],
         ['OS=="win"', {
           'defines': [
             'WEBCORE_NAVIGATOR_PLATFORM="Win32"',
             '__PRETTY_FUNCTION__=__FUNCTION__',
           ],
           # In generated bindings code: 'switch contains default but no case'.
           # Disable c4267 warnings until we fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4065, 4267 ],
         }],
         ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
@@ skipping 52 matching lines @@
         '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
         '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
         '<(DEPTH)/third_party/ots/ots.gyp:ots',
         '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
-      # This is needed for mac because of webkit_system_interface. It'd be nice
-      # if this hard dependency could be split off the rest.
-      'hard_dependency': 1,
       'direct_dependent_settings': {
         'defines': [
           'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
           'WEBKIT_IMPLEMENTATION=1',
         ],
         'include_dirs': [
           '<@(webcore_include_dirs)',
           '<(DEPTH)/gpu',
           '<(DEPTH)/third_party/angle/include/GLSLANG',
         ],
@@ skipping 38 matching lines @@
           'export_dependent_settings': [
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
         }],
         ['OS=="android"', {
           'sources/': [
             ['exclude', 'accessibility/'],
           ],
         }],
         ['OS=="mac"', {
-          'dependencies': [
-            'webkit_system_interface',
-          ],
-          'export_dependent_settings': [
-            'webkit_system_interface',
-          ],
           'direct_dependent_settings': {
             '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
@@ skipping 15 matching lines @@
               'WebCoreFlippedView=ChromiumWebCoreObjCWebCoreFlippedView',
               'WebCoreTextFieldCell=ChromiumWebCoreObjCWebCoreTextFieldCell',
               'WebScrollbarPrefsObserver=ChromiumWebCoreObjCWebScrollbarPrefsObserver',
               'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
               'WebFontCache=ChromiumWebCoreObjCWebFontCache',
               'WebScrollAnimationHelperDelegate=ChromiumWebCoreObjCWebScrollAnimationHelperDelegate',
               'WebScrollbarPainterControllerDelegate=ChromiumWebCoreObjCWebScrollbarPainterControllerDelegate',
               'WebScrollbarPainterDelegate=ChromiumWebCoreObjCWebScrollbarPainterDelegate',
               'WebScrollbarPartAnimation=ChromiumWebCoreObjCWebScrollbarPartAnimation',
             ],
-            'include_dirs': [
-              '<(DEPTH)/third_party/apple_webkit',
-            ],
             'postbuilds': [
               {
                 # This step ensures that any Objective-C names that aren't
                 # redefined to be "safe" above will cause a build failure.
                 'postbuild_name': 'Check Objective-C Rename',
                 'variables': {
                   'class_whitelist_regex':
                       'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView',
                   'category_whitelist_regex':
                       'TCMInterposing|ScrollAnimatorChromiumMacExt|WebCoreTheme',
@@ skipping 103 matching lines @@
     {
       'target_name': 'webcore_platform',
       'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       # Disable c4724 warnings which is generated in VS2012 due to improper
       # compiler optimizations, see crbug.com/237063
       'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
-      # This is needed for mac because of webkit_system_interface. It'd be nice
-      # if this hard dependency could be split off the rest.
-      'hard_dependency': 1,
       'sources': [
         '<@(webcore_platform_files)',
       ],
       'sources/': [
         # FIXME: Figure out how to store these patterns in a variable.
         ['exclude', '(cf|cg|harfbuzz|mac|opentype|svg|win)/'],
         ['exclude', '(?<!Chromium)(CF|CG|Mac|OpenType|Win)\\.(cpp|mm?)$'],
 
         # Used only by mac.
         ['exclude', 'platform/Theme\\.cpp$'],
@@ skipping 53 matching lines @@
           'sources/': [
             # Cherry-pick files excluded by the broader regular expressions above.
             ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'],
           ],
         }, { # toolkit_uses_gtk==0
           'sources/': [
             ['exclude', 'Gtk\\.cpp$'],
           ],
         }],
         ['OS=="mac"', {
-          # Necessary for Mac .mm stuff.
-          'include_dirs': [
-            '<(DEPTH)/third_party/apple_webkit',
-          ],
           'dependencies': [
-            'webkit_system_interface',
             '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
           ],
           'sources': [
             '../editing/SmartReplaceCF.cpp',
           ],
           'sources/': [
             # Additional files from the WebCore Mac build that are presently
             # used in the WebCore Chromium Mac build too.
 
             # The Mac build is USE(CF).
@@ skipping 263 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'webcore_remaining',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/third_party/v8-i18n/build/all.gyp:v8-i18n',
         'webcore_prerequisites',
       ],
-      # This is needed for mac because of webkit_system_interface. It'd be nice
-      # if this hard dependency could be split off the rest.
-      'hard_dependency': 1,
       'sources': [
         '<@(webcore_files)',
       ],
       'sources/': [
         ['exclude', 'rendering/'],
 
         # FIXME: Figure out how to store these patterns in a variable.
         ['exclude', '(cf|cg|mac|opentype|svg|win)/'],
         ['exclude', '(?<!Chromium)(CF|CG|Mac|OpenType|Win)\\.(cpp|mm?)$'],
       ],
@@ skipping 66 matching lines @@
       },
       'conditions': [
         ['target_arch=="arm"', {
           'dependencies': [
             'webcore_arm_neon',
           ],
         }],
         ['OS=="mac"', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(DEPTH)/third_party/apple_webkit',
               '../../WebKit/mac/WebCoreSupport',
             ],
           },
         }],
         ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
           'link_settings': {
             'ldflags': [
               '<!@(pkg-config --libs-only-L ipp)',
             ],
             'libraries': [
@@ skipping 41 matching lines @@
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettings.h',
         '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettingsGenerated.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettingsGenerated.h',
       ],
       'sources/': [
         ['exclude', 'testing/js'],
       ],
     },
   ],  # targets
 }