⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 254570 in webkit


Ignore:
Timestamp:
Jan 15, 2020, 9:14:33 AM (7 years ago)
Author:
Alan Coon
Message:

Cherry-pick r254551. rdar://problem/58508705

Build ANGLE as a dynamic library
​https://bugs.webkit.org/show_bug.cgi?id=204708
rdar://57349384

Rolling this out for the 2nd time.

Source/ThirdParty/ANGLE:

  • it caused issues with the shared dyld cache, because the cache doesn't know to include the libary until it already exists in the build
  • probably related to the above, we saw some performance regressions directly related to this change
  • ANGLE.xcodeproj/project.pbxproj:
  • Configurations/ANGLE.xcconfig:
  • Configurations/Base.xcconfig:
  • Configurations/DebugRelease.xcconfig:
  • include/CMakeLists.txt:
  • include/GLSLANG/ShaderLang.h:
  • include/GLSLANG/ShaderVars.h:
  • src/libANGLE/renderer/gl/cgl/DisplayCGL.mm: (rx::DisplayCGL::isValidNativeWindow const):
  • src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm: (rx::WindowSurfaceCGL::WindowSurfaceCGL): (rx::WindowSurfaceCGL::~WindowSurfaceCGL):
  • src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm: (rx::DisplayEAGL::terminate): (rx::DisplayEAGL::isValidNativeWindow const): (rx::WorkerContextEAGL::~WorkerContextEAGL):
  • src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm: (rx::WindowSurfaceEAGL::WindowSurfaceEAGL): (rx::WindowSurfaceEAGL::~WindowSurfaceEAGL):

Source/WebCore:

  • Configurations/WebCore.xcconfig:
  • Configurations/WebCoreTestSupport.xcconfig:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/graphics/ANGLEWebKitBridge.cpp: (WebCore::ANGLEWebKitBridge::ANGLEWebKitBridge): (WebCore::ANGLEWebKitBridge::cleanupCompilers): (WebCore::ANGLEWebKitBridge::compileShaderSource): (WebCore::ANGLEWebKitBridge::angleAvailable): Deleted.
  • platform/graphics/ANGLEWebKitBridge.h:
  • platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@254551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-610.1.1-branch/Source
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

    r253926 r254570  
    456456                5CB3014F1DE39F4700D2C405 /* DisplayCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301491DE39F4700D2C405 /* DisplayCGL.h */; };
    457457                5CB301511DE39F4700D2C405 /* PbufferSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */; };
     458                5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048D1DE4144400D2C405 /* OpenGL.framework */; };
    458459                5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */; };
    459460                5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */; };
    … …  
    836837                3153ACFE239071D900D51DD8 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
    837838                3153ACFF239071D900D51DD8 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
    838                 3153AD002390C2EA00D51DD8 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; };
    839                 3153AD022390C32100D51DD8 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
    840839                315EBD3E1FCE43BD00AC7A89 /* uniform_type_info_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uniform_type_info_autogen.cpp; sourceTree = "<group>"; };
    841840                315EBD401FCE442600AC7A89 /* TranslatorVulkan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TranslatorVulkan.cpp; sourceTree = "<group>"; };
    … …  
    15001499                A3694FC523202C5200A83D8F /* BuiltinsWorkaroundGLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltinsWorkaroundGLSL.h; sourceTree = "<group>"; };
    15011500                A3E827A8230CAE2C00E76682 /* commit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = commit.h; sourceTree = "<group>"; };
    1502                 FB39D0D11200F0E300088E69 /* libANGLE-shared.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libANGLE-shared.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
     1501                FB39D0D11200F0E300088E69 /* libANGLE.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libANGLE.a; sourceTree = BUILT_PRODUCTS_DIR; };
    15031502                FB39D2BF1200F3E600088E69 /* ShaderLang.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ShaderLang.h; sourceTree = "<group>"; };
    15041503/* End PBXFileReference section */
    … …  
    15101509                        files = (
    15111510                                5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */,
     1511                                5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */,
    15121512                                5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */,
    15131513                        );
    … …  
    22002200                        children = (
    22012201                                5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */,
    2202                                 3153AD022390C32100D51DD8 /* IOKit.framework */,
    2203                                 3153AD002390C2EA00D51DD8 /* IOSurface.framework */,
    22042202                                5CB3048D1DE4144400D2C405 /* OpenGL.framework */,
    22052203                                5CB3048F1DE4145500D2C405 /* QuartzCore.framework */,
    … …  
    25052503                        isa = PBXGroup;
    25062504                        children = (
    2507                                 FB39D0D11200F0E300088E69 /* libANGLE-shared.dylib */,
     2505                                FB39D0D11200F0E300088E69 /* libANGLE.a */,
    25082506                        );
    25092507                        name = Products;
    … …  
    29772975                                312BDB0D15FECACE0097EBC7 /* CopyFiles */,
    29782976                                6E28B8742294DD8000717E69 /* ShellScript */,
    2979                                 313DE867239FFF91008FC47B /* Attempt to fool Apple Test Platform */,
    29802977                        );
    29812978                        buildRules = (
    … …  
    29862983                        name = ANGLE;
    29872984                        productName = angle;
    2988                         productReference = FB39D0D11200F0E300088E69 /* libANGLE-shared.dylib */;
    2989                         productType = "com.apple.product-type.library.dynamic";
     2985                        productReference = FB39D0D11200F0E300088E69 /* libANGLE.a */;
     2986                        productType = "com.apple.product-type.library.static";
    29902987                };
    29912988/* End PBXNativeTarget section */
    … …  
    30183015
    30193016/* Begin PBXShellScriptBuildPhase section */
    3020                 313DE867239FFF91008FC47B /* Attempt to fool Apple Test Platform */ = {
    3021                         isa = PBXShellScriptBuildPhase;
    3022                         buildActionMask = 2147483647;
    3023                         files = (
    3024                         );
    3025                         inputFileListPaths = (
    3026                         );
    3027                         inputPaths = (
    3028                         );
    3029                         name = "Attempt to fool Apple Test Platform";
    3030                         outputFileListPaths = (
    3031                         );
    3032                         outputPaths = (
    3033                         );
    3034                         runOnlyForDeploymentPostprocessing = 0;
    3035                         shellPath = /bin/sh;
    3036                         shellScript = "if [ \"$DEPLOYMENT_LOCATION\" == \"YES\" ] ; then\n    # Apple-internal build.\n    output_dir=${DSTROOT}${WK_ALTERNATE_FRAMEWORKS_DIR}/usr/local/lib\nelse\n    # External build.\n    output_dir=${BUILT_PRODUCTS_DIR}/usr/local/lib\nfi\n\nmkdir -p $output_dir\necho \"Fake file to fool Apple's test system\" > $output_dir/libANGLE.a\n";
    3037                 };
    30383017                6E28B8742294DD8000717E69 /* ShellScript */ = {
    30393018                        isa = PBXShellScriptBuildPhase;
    … …  
    33953374                        baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
    33963375                        buildSettings = {
     3376                                GCC_PREPROCESSOR_DEFINITIONS = (
     3377                                        ANGLE_ENABLE_OPENGL,
     3378                                        ANGLE_ENABLE_GLSL,
     3379                                        ANGLE_ENABLE_ESSL,
     3380                                        GL_SILENCE_DEPRECATION,
     3381                                );
     3382                                HEADER_SEARCH_PATHS = (
     3383                                        include,
     3384                                        src,
     3385                                        third_party/base,
     3386                                        src/common/third_party/base,
     3387                                );
     3388                                OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
    33973389                        };
    33983390                        name = Production;
    … …  
    34173409                        baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
    34183410                        buildSettings = {
     3411                                GCC_PREPROCESSOR_DEFINITIONS = (
     3412                                        ANGLE_ENABLE_OPENGL,
     3413                                        ANGLE_ENABLE_GLSL,
     3414                                        ANGLE_ENABLE_ESSL,
     3415                                        GL_SILENCE_DEPRECATION,
     3416                                );
     3417                                HEADER_SEARCH_PATHS = (
     3418                                        include,
     3419                                        src,
     3420                                        third_party/base,
     3421                                        src/common/third_party/base,
     3422                                );
     3423                                OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
    34193424                        };
    34203425                        name = Debug;
    … …  
    34243429                        baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
    34253430                        buildSettings = {
     3431                                GCC_PREPROCESSOR_DEFINITIONS = (
     3432                                        ANGLE_ENABLE_OPENGL,
     3433                                        ANGLE_ENABLE_GLSL,
     3434                                        ANGLE_ENABLE_ESSL,
     3435                                        GL_SILENCE_DEPRECATION,
     3436                                );
     3437                                HEADER_SEARCH_PATHS = (
     3438                                        include,
     3439                                        src,
     3440                                        third_party/base,
     3441                                        src/common/third_party/base,
     3442                                );
     3443                                OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
    34263444                        };
    34273445                        name = Release;

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/ChangeLog

    r254249 r254570  
     12020-01-15  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r254551. rdar://problem/58508705
     4
     5    Build ANGLE as a dynamic library
     6    https://bugs.webkit.org/show_bug.cgi?id=204708
     7    rdar://57349384
     8   
     9    Rolling this out for the 2nd time.
     10   
     11    Source/ThirdParty/ANGLE:
     12   
     13    - it caused issues with the shared dyld cache, because the
     14    cache doesn't know to include the libary until it already
     15    exists in the build
     16    - probably related to the above, we saw some performance
     17    regressions directly related to this change
     18   
     19    * ANGLE.xcodeproj/project.pbxproj:
     20    * Configurations/ANGLE.xcconfig:
     21    * Configurations/Base.xcconfig:
     22    * Configurations/DebugRelease.xcconfig:
     23    * include/CMakeLists.txt:
     24    * include/GLSLANG/ShaderLang.h:
     25    * include/GLSLANG/ShaderVars.h:
     26    * src/libANGLE/renderer/gl/cgl/DisplayCGL.mm:
     27    (rx::DisplayCGL::isValidNativeWindow const):
     28    * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
     29    (rx::WindowSurfaceCGL::WindowSurfaceCGL):
     30    (rx::WindowSurfaceCGL::~WindowSurfaceCGL):
     31    * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm:
     32    (rx::DisplayEAGL::terminate):
     33    (rx::DisplayEAGL::isValidNativeWindow const):
     34    (rx::WorkerContextEAGL::~WorkerContextEAGL):
     35    * src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm:
     36    (rx::WindowSurfaceEAGL::WindowSurfaceEAGL):
     37    (rx::WindowSurfaceEAGL::~WindowSurfaceEAGL):
     38   
     39    Source/WebCore:
     40   
     41    * Configurations/WebCore.xcconfig:
     42    * Configurations/WebCoreTestSupport.xcconfig:
     43    * WebCore.xcodeproj/project.pbxproj:
     44    * platform/graphics/ANGLEWebKitBridge.cpp:
     45    (WebCore::ANGLEWebKitBridge::ANGLEWebKitBridge):
     46    (WebCore::ANGLEWebKitBridge::cleanupCompilers):
     47    (WebCore::ANGLEWebKitBridge::compileShaderSource):
     48    (WebCore::ANGLEWebKitBridge::angleAvailable): Deleted.
     49    * platform/graphics/ANGLEWebKitBridge.h:
     50    * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
     51    (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
     52   
     53    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254551 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     54
     55    2020-01-14  Dean Jackson  <dino@apple.com>
     56
     57            Build ANGLE as a dynamic library
     58            https://bugs.webkit.org/show_bug.cgi?id=204708
     59            rdar://57349384
     60
     61            Rolling this out for the 2nd time.
     62
     63            - it caused issues with the shared dyld cache, because the
     64            cache doesn't know to include the libary until it already
     65            exists in the build
     66            - probably related to the above, we saw some performance
     67            regressions directly related to this change
     68
     69            * ANGLE.xcodeproj/project.pbxproj:
     70            * Configurations/ANGLE.xcconfig:
     71            * Configurations/Base.xcconfig:
     72            * Configurations/DebugRelease.xcconfig:
     73            * include/CMakeLists.txt:
     74            * include/GLSLANG/ShaderLang.h:
     75            * include/GLSLANG/ShaderVars.h:
     76            * src/libANGLE/renderer/gl/cgl/DisplayCGL.mm:
     77            (rx::DisplayCGL::isValidNativeWindow const):
     78            * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
     79            (rx::WindowSurfaceCGL::WindowSurfaceCGL):
     80            (rx::WindowSurfaceCGL::~WindowSurfaceCGL):
     81            * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm:
     82            (rx::DisplayEAGL::terminate):
     83            (rx::DisplayEAGL::isValidNativeWindow const):
     84            (rx::WorkerContextEAGL::~WorkerContextEAGL):
     85            * src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm:
     86            (rx::WindowSurfaceEAGL::WindowSurfaceEAGL):
     87            (rx::WindowSurfaceEAGL::~WindowSurfaceEAGL):
     88
    1892020-01-08  Kenneth Russell  <kbr@chromium.org>
    290

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig

    r253824 r254570  
    22#include "WebKitTargetConditionals.xcconfig"
    33
    4 PRODUCT_NAME = ANGLE-shared;
    5 
    6 EXECUTABLE_PREFIX = lib;
    7 
    8 ANGLE_OTHER_LDFLAGS = -allowable_client WebCore -allowable_client WebCoreTestSupport $(ANGLE_OTHER_LDFLAGS_$(WK_PLATFORM_NAME));
    9 ANGLE_OTHER_LDFLAGS_iphoneos = -framework IOSurface -framework OpenGLES;
    10 ANGLE_OTHER_LDFLAGS_iphonesimulator = $(ANGLE_OTHER_LDFLAGS_iphoneos);
    11 ANGLE_OTHER_LDFLAGS_watchos = $(ANGLE_OTHER_LDFLAGS_iphoneos);
    12 ANGLE_OTHER_LDFLAGS_watchsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator);
    13 ANGLE_OTHER_LDFLAGS_appletvos = $(ANGLE_OTHER_LDFLAGS_iphoneos);
    14 ANGLE_OTHER_LDFLAGS_appletvsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator);
    15 ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -framework IOSurface -framework OpenGL;
    16 ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -framework IOSurface -framework OpenGL;
    17 
    18 INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
    19 INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    20 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    21 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    22 
    23 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    24 DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
    25 DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = @loader_path/../../../;
    26 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
    27 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
    28 
    29 HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base;
    30 
    31 ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
    32 
    33 PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_HEADERS_FOLDER_PATH);
    34 PUBLIC_HEADERS_FOLDER_PATH[sdk=macosx*] = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_PLATFORM_NAME));
    35 PUBLIC_HEADERS_FOLDER_PATH_macosx = $(ANGLE_HEADERS_FOLDER_PATH);
    36 PUBLIC_HEADERS_FOLDER_PATH_maccatalyst = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(ANGLE_HEADERS_FOLDER_PATH);
    37 
    38 USE_HEADERMAP = NO;
    39 
    40 GCC_PREPROCESSOR_DEFINITIONS = LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION;
    41 
    42 INSTALLHDRS_SCRIPT_PHASE = YES;
     4PRODUCT_NAME = ANGLE;
    435
    446APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
     7CLANG_WARN_BOOL_CONVERSION = YES;
     8CLANG_WARN_ENUM_CONVERSION = YES;
     9CLANG_WARN_INT_CONVERSION = YES;
     10COMBINE_HIDPI_IMAGES = NO;
     11ENABLE_STRICT_OBJC_MSGSEND = YES;
     12HEADER_SEARCH_PATHS = include src src/common/third_party/numerics;
     13INSTALL_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/lib;
     14PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r253824 r254570  
    11#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
    2 #include? "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/PlatformSupport.xcconfig"
    32#include "SDKVariant.xcconfig"
    4 #include "WebKitTargetConditionals.xcconfig"
    53
    64CODE_SIGN_IDENTITY = -;
    7 
    8 SDKROOT = macosx.internal;
    95
    106USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
    … …  
    1511ALWAYS_SEARCH_USER_PATHS = NO;
    1612
    17 CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
    1813CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
    1914CLANG_CXX_LIBRARY = libc++;
    20 CLANG_ENABLE_OBJC_ARC = YES;
    2115CLANG_ENABLE_OBJC_WEAK = YES;
    2216CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
    … …  
    2418CLANG_WARN_COMMA = YES;
    2519CLANG_WARN_CONSTANT_CONVERSION = YES;
    26 CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    2720CLANG_WARN_EMPTY_BODY = YES;
    2821CLANG_WARN_ENUM_CONVERSION = YES;
    … …  
    3023CLANG_WARN_INT_CONVERSION = YES;
    3124CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
    32 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
     25CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    3326CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
    3427CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
     28CLANG_WARN_SUSPICIOUS_MOVE = YES;
    3529CLANG_WARN_STRICT_PROTOTYPES = YES;
    36 CLANG_WARN_SUSPICIOUS_MOVE = YES;
    3730CLANG_WARN_UNREACHABLE_CODE = YES;
    38 
     31CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
     32DEAD_CODE_STRIPPING = YES;
     33DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
    3934GCC_C_LANGUAGE_STANDARD = gnu99;
    4035GCC_DEBUGGING_SYMBOLS = default;
    … …  
    4237GCC_ENABLE_CPP_RTTI = NO;
    4338GCC_ENABLE_OBJC_EXCEPTIONS = YES;
     39ENABLE_STRICT_OBJC_MSGSEND = YES;
    4440GCC_ENABLE_SYMBOL_SEPARATION = NO;
    4541GCC_FAST_OBJC_DISPATCH = YES;
    … …  
    5046GCC_PRECOMPILE_PREFIX_HEADER = NO;
    5147GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    52 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    5348GCC_THREADSAFE_STATICS = NO;
    5449GCC_TREAT_WARNINGS_AS_ERRORS = YES;
    … …  
    5651GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
    5752GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
    58 GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
     53GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
    5954GCC_WARN_ABOUT_RETURN_TYPE = YES;
    6055GCC_WARN_UNDECLARED_SELECTOR = YES;
     56CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
     57CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
    6158GCC_WARN_UNINITIALIZED_AUTOS = YES;
    6259GCC_WARN_UNUSED_FUNCTION = YES;
    6360GCC_WARN_UNUSED_VARIABLE = YES;
    64 
    65 DEAD_CODE_STRIPPING = YES;
    66 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
    67 ENABLE_STRICT_OBJC_MSGSEND = YES;
    68 
    6961PREBINDING = NO;
    7062STRIP_INSTALLED_PRODUCT = NO;
    71 WARNING_CFLAGS = -Wglobal-constructors -Wno-inconsistent-missing-override;
     63WARNING_CFLAGS = -Wglobal-constructors -Wno-newline-eof -Wno-inconsistent-missing-override;
    7264
    7365SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
    … …  
    8173OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
    8274OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    83 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_OTHER_LDFLAGS);
     75OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    8476
    8577ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
    8678ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
    87 ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR);
    88 
    89 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    90 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(WK_PLATFORM_NAME));
    91 NORMAL_WEBCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    92 NORMAL_WEBCORE_FRAMEWORKS_DIR_maccatalyst = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    93 
    94 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
    95 
    96 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
    97 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    98 
    99 WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
    100 WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
     79ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
    10180
    10281// Disable on all platforms other than macOS, due to <rdar://problem/49013399>.

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

    r253824 r254570  
    2121SDKROOT_YES = macosx.internal;
    2222
    23 WK_RELOCATABLE_FRAMEWORKS = YES;
    24 
    2523WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
    2624

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/include/CMakeLists.txt

    r253824 r254570  
    1717
    1818set(glslang_headers
    19     export.h
    2019    GLSLANG/ShaderLang.h
    2120    GLSLANG/ShaderVars.h

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h

    r253824 r254570  
    526526// If the function succeeds, the return value is true, else false.
    527527//
    528 ANGLE_EXPORT bool Initialize();
     528bool Initialize();
    529529//
    530530// Driver should call this at shutdown.
    531531// If the function succeeds, the return value is true, else false.
    532532//
    533 ANGLE_EXPORT bool Finalize();
     533bool Finalize();
    534534
    535535//
    … …  
    538538// resources: The object to initialize. Will be comparable with memcmp.
    539539//
    540 ANGLE_EXPORT void InitBuiltInResources(ShBuiltInResources *resources);
     540void InitBuiltInResources(ShBuiltInResources *resources);
    541541
    542542//
    … …  
    545545// Parameters:
    546546// handle: Specifies the handle of the compiler to be used.
    547 ANGLE_EXPORT const std::string &GetBuiltInResourcesString(const ShHandle handle);
     547const std::string &GetBuiltInResourcesString(const ShHandle handle);
    548548
    549549//
    … …  
    558558//         be supported in some configurations.
    559559// resources: Specifies the built-in resources.
    560 ANGLE_EXPORT ShHandle ConstructCompiler(sh::GLenum type,
    561                                         ShShaderSpec spec,
    562                                         ShShaderOutput output,
    563                                         const ShBuiltInResources *resources);
    564 ANGLE_EXPORT void Destruct(ShHandle handle);
     560ShHandle ConstructCompiler(sh::GLenum type,
     561                           ShShaderSpec spec,
     562                           ShShaderOutput output,
     563                           const ShBuiltInResources *resources);
     564void Destruct(ShHandle handle);
    565565
    566566//
    … …  
    588588//               Can be queried by calling ShGetVariableInfo().
    589589//
    590 ANGLE_EXPORT bool Compile(const ShHandle handle,
     590bool Compile(const ShHandle handle,
    591591             const char *const shaderStrings[],
    592592             size_t numStrings,
    … …  
    594594
    595595// Clears the results from the previous compilation.
    596 ANGLE_EXPORT void ClearResults(const ShHandle handle);
     596void ClearResults(const ShHandle handle);
    597597
    598598// Return the version of the shader language.
    599 ANGLE_EXPORT int GetShaderVersion(const ShHandle handle);
     599int GetShaderVersion(const ShHandle handle);
    600600
    601601// Return the currently set language output type.
    602 ANGLE_EXPORT ShShaderOutput GetShaderOutputType(const ShHandle handle);
     602ShShaderOutput GetShaderOutputType(const ShHandle handle);
    603603
    604604// Returns null-terminated information log for a compiled shader.
    605605// Parameters:
    606606// handle: Specifies the compiler
    607 ANGLE_EXPORT const std::string &GetInfoLog(const ShHandle handle);
     607const std::string &GetInfoLog(const ShHandle handle);
    608608
    609609// Returns null-terminated object code for a compiled shader.
    610610// Parameters:
    611611// handle: Specifies the compiler
    612 ANGLE_EXPORT const std::string &GetObjectCode(const ShHandle handle);
     612const std::string &GetObjectCode(const ShHandle handle);
    613613
    614614// Returns a (original_name, hash) map containing all the user defined names in the shader,
    … …  
    616616// Parameters:
    617617// handle: Specifies the compiler
    618 ANGLE_EXPORT const std::map<std::string, std::string> *GetNameHashingMap(const ShHandle handle);
     618const std::map<std::string, std::string> *GetNameHashingMap(const ShHandle handle);
    619619
    620620// Shader variable inspection.
    … …  
    624624// Parameters:
    625625// handle: Specifies the compiler
    626 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetUniforms(const ShHandle handle);
    627 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetVaryings(const ShHandle handle);
    628 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetInputVaryings(const ShHandle handle);
    629 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetOutputVaryings(const ShHandle handle);
    630 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetAttributes(const ShHandle handle);
    631 ANGLE_EXPORT const std::vector<sh::ShaderVariable> *GetOutputVariables(const ShHandle handle);
    632 ANGLE_EXPORT const std::vector<sh::InterfaceBlock> *GetInterfaceBlocks(const ShHandle handle);
    633 ANGLE_EXPORT const std::vector<sh::InterfaceBlock> *GetUniformBlocks(const ShHandle handle);
    634 ANGLE_EXPORT const std::vector<sh::InterfaceBlock> *GetShaderStorageBlocks(const ShHandle handle);
    635 ANGLE_EXPORT sh::WorkGroupSize GetComputeShaderLocalGroupSize(const ShHandle handle);
     626const std::vector<sh::ShaderVariable> *GetUniforms(const ShHandle handle);
     627const std::vector<sh::ShaderVariable> *GetVaryings(const ShHandle handle);
     628const std::vector<sh::ShaderVariable> *GetInputVaryings(const ShHandle handle);
     629const std::vector<sh::ShaderVariable> *GetOutputVaryings(const ShHandle handle);
     630const std::vector<sh::ShaderVariable> *GetAttributes(const ShHandle handle);
     631const std::vector<sh::ShaderVariable> *GetOutputVariables(const ShHandle handle);
     632const std::vector<sh::InterfaceBlock> *GetInterfaceBlocks(const ShHandle handle);
     633const std::vector<sh::InterfaceBlock> *GetUniformBlocks(const ShHandle handle);
     634const std::vector<sh::InterfaceBlock> *GetShaderStorageBlocks(const ShHandle handle);
     635sh::WorkGroupSize GetComputeShaderLocalGroupSize(const ShHandle handle);
    636636// Returns the number of views specified through the num_views layout qualifier. If num_views is
    637637// not set, the function returns -1.
    638 ANGLE_EXPORT int GetVertexShaderNumViews(const ShHandle handle);
     638int GetVertexShaderNumViews(const ShHandle handle);
    639639
    640640// Returns true if the passed in variables pack in maxVectors followingthe packing rules from the
    … …  
    645645// maxVectors: the available rows of registers.
    646646// variables: an array of variables.
    647 ANGLE_EXPORT bool CheckVariablesWithinPackingLimits(int maxVectors,
    648                                                     const std::vector<sh::ShaderVariable> &variables);
     647bool CheckVariablesWithinPackingLimits(int maxVectors,
     648                                       const std::vector<sh::ShaderVariable> &variables);
    649649
    650650// Gives the compiler-assigned register for a shader storage block.
    … …  
    655655// shaderStorageBlockName: Specifies the shader storage block
    656656// indexOut: output variable that stores the assigned register
    657 ANGLE_EXPORT bool GetShaderStorageBlockRegister(const ShHandle handle,
    658                                                 const std::string &shaderStorageBlockName,
    659                                                 unsigned int *indexOut);
     657bool GetShaderStorageBlockRegister(const ShHandle handle,
     658                                   const std::string &shaderStorageBlockName,
     659                                   unsigned int *indexOut);
    660660
    661661// Gives the compiler-assigned register for a uniform block.
    … …  
    666666// uniformBlockName: Specifies the uniform block
    667667// indexOut: output variable that stores the assigned register
    668 ANGLE_EXPORT bool GetUniformBlockRegister(const ShHandle handle,
    669                                           const std::string &uniformBlockName,
    670                                           unsigned int *indexOut);
     668bool GetUniformBlockRegister(const ShHandle handle,
     669                             const std::string &uniformBlockName,
     670                             unsigned int *indexOut);
    671671
    672672// Gives a map from uniform names to compiler-assigned registers in the default uniform block.
    673673// Note that the map contains also registers of samplers that have been extracted from structs.
    674 ANGLE_EXPORT const std::map<std::string, unsigned int> *GetUniformRegisterMap(const ShHandle handle);
     674const std::map<std::string, unsigned int> *GetUniformRegisterMap(const ShHandle handle);
    675675
    676676// Sampler, image and atomic counters share registers(t type and u type),

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h

    r253824 r254570  
    1111#define GLSLANG_SHADERVARS_H_
    1212
    13 #include "export.h"
    14 
    1513#include <algorithm>
    1614#include <array>
    … …  
    6563struct ShaderVariable
    6664{
    67     ANGLE_EXPORT ShaderVariable();
     65    ShaderVariable();
    6866    ShaderVariable(GLenum typeIn);
    6967    ShaderVariable(GLenum typeIn, unsigned int arraySizeIn);
    70     ANGLE_EXPORT ~ShaderVariable();
    71     ANGLE_EXPORT ShaderVariable(const ShaderVariable &other);
    72     ANGLE_EXPORT ShaderVariable &operator=(const ShaderVariable &other);
     68    ~ShaderVariable();
     69    ShaderVariable(const ShaderVariable &other);
     70    ShaderVariable &operator=(const ShaderVariable &other);
    7371    bool operator==(const ShaderVariable &other) const;
    7472    bool operator!=(const ShaderVariable &other) const { return !operator==(other); }

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm

    r253824 r254570  
    293293bool DisplayCGL::isValidNativeWindow(EGLNativeWindowType window) const
    294294{
    295     NSObject *layer = (__bridge NSObject *)window;
     295    NSObject *layer = reinterpret_cast<NSObject *>(window);
    296296    return [layer isKindOfClass:[CALayer class]];
    297297}

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm

    r253824 r254570  
    154154      mSwapLayer(nil),
    155155      mCurrentSwapId(0),
    156       mLayer((__bridge CALayer *)layer),
     156      mLayer(reinterpret_cast<CALayer *>(layer)),
    157157      mContext(context),
    158158      mFunctions(renderer->getFunctions()),
    … …  
    176176    {
    177177        [mSwapLayer removeFromSuperlayer];
     178        [mSwapLayer release];
    178179        mSwapLayer = nil;
    179180    }

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm

    r254036 r254570  
    130130    {
    131131        [EAGLContext setCurrentContext:nil];
     132        [mContext release];
    132133        mContext = nullptr;
    133134    }
    … …  
    260261bool DisplayEAGL::isValidNativeWindow(EGLNativeWindowType window) const
    261262{
    262     NSObject *layer = (__bridge NSObject *)window;
     263    NSObject *layer = reinterpret_cast<NSObject *>(window);
    263264    return [layer isKindOfClass:[CALayer class]];
    264265}
    … …  
    351352{
    352353    [EAGLContext setCurrentContext:nil];
     354    [mContext release];
    353355    mContext = nullptr;
    354356}

  • branches/safari-610.1.1-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm

    r253824 r254570  
    139139      mSwapLayer(nil),
    140140      mCurrentSwapId(0),
    141       mLayer((__bridge CALayer *)layer),
     141      mLayer(reinterpret_cast<CALayer *>(layer)),
    142142      mContext(context),
    143143      mFunctions(renderer->getFunctions()),
    … …  
    161161    {
    162162        [mSwapLayer removeFromSuperlayer];
     163        [mSwapLayer release];
    163164        mSwapLayer = nil;
    164165    }

  • branches/safari-610.1.1-branch/Source/WebCore/ChangeLog

    r254537 r254570  
     12020-01-15  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r254551. rdar://problem/58508705
     4
     5    Build ANGLE as a dynamic library
     6    https://bugs.webkit.org/show_bug.cgi?id=204708
     7    rdar://57349384
     8   
     9    Rolling this out for the 2nd time.
     10   
     11    Source/ThirdParty/ANGLE:
     12   
     13    - it caused issues with the shared dyld cache, because the
     14    cache doesn't know to include the libary until it already
     15    exists in the build
     16    - probably related to the above, we saw some performance
     17    regressions directly related to this change
     18   
     19    * ANGLE.xcodeproj/project.pbxproj:
     20    * Configurations/ANGLE.xcconfig:
     21    * Configurations/Base.xcconfig:
     22    * Configurations/DebugRelease.xcconfig:
     23    * include/CMakeLists.txt:
     24    * include/GLSLANG/ShaderLang.h:
     25    * include/GLSLANG/ShaderVars.h:
     26    * src/libANGLE/renderer/gl/cgl/DisplayCGL.mm:
     27    (rx::DisplayCGL::isValidNativeWindow const):
     28    * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
     29    (rx::WindowSurfaceCGL::WindowSurfaceCGL):
     30    (rx::WindowSurfaceCGL::~WindowSurfaceCGL):
     31    * src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm:
     32    (rx::DisplayEAGL::terminate):
     33    (rx::DisplayEAGL::isValidNativeWindow const):
     34    (rx::WorkerContextEAGL::~WorkerContextEAGL):
     35    * src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm:
     36    (rx::WindowSurfaceEAGL::WindowSurfaceEAGL):
     37    (rx::WindowSurfaceEAGL::~WindowSurfaceEAGL):
     38   
     39    Source/WebCore:
     40   
     41    * Configurations/WebCore.xcconfig:
     42    * Configurations/WebCoreTestSupport.xcconfig:
     43    * WebCore.xcodeproj/project.pbxproj:
     44    * platform/graphics/ANGLEWebKitBridge.cpp:
     45    (WebCore::ANGLEWebKitBridge::ANGLEWebKitBridge):
     46    (WebCore::ANGLEWebKitBridge::cleanupCompilers):
     47    (WebCore::ANGLEWebKitBridge::compileShaderSource):
     48    (WebCore::ANGLEWebKitBridge::angleAvailable): Deleted.
     49    * platform/graphics/ANGLEWebKitBridge.h:
     50    * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
     51    (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
     52   
     53    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254551 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     54
     55    2020-01-14  Dean Jackson  <dino@apple.com>
     56
     57            Build ANGLE as a dynamic library
     58            https://bugs.webkit.org/show_bug.cgi?id=204708
     59            rdar://57349384
     60
     61            Rolling this out for the 2nd time.
     62
     63            * Configurations/WebCore.xcconfig:
     64            * Configurations/WebCoreTestSupport.xcconfig:
     65            * WebCore.xcodeproj/project.pbxproj:
     66            * platform/graphics/ANGLEWebKitBridge.cpp:
     67            (WebCore::ANGLEWebKitBridge::ANGLEWebKitBridge):
     68            (WebCore::ANGLEWebKitBridge::cleanupCompilers):
     69            (WebCore::ANGLEWebKitBridge::compileShaderSource):
     70            (WebCore::ANGLEWebKitBridge::angleAvailable): Deleted.
     71            * platform/graphics/ANGLEWebKitBridge.h:
     72            * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
     73            (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
     74
    1752020-01-14  Kocsen Chung  <kocsen_chung@apple.com>
    276

  • branches/safari-610.1.1-branch/Source/WebCore/Configurations/WebCore.xcconfig

    r253824 r254570  
    4040SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
    4141
    42 WK_EMBEDDED_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
    43 WK_EMBEDDED_LIBRARY_DIR[sdk=macosx*] = $(WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    44 WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    45 WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
     42WK_LIBWEBRTC_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
     43WK_LIBWEBRTC_LIBRARY_DIR[sdk=macosx*] = $(WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
     44WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
     45WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    4646
    47 LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_EMBEDDED_LIBRARY_DIR)";
     47LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
    4848
    4949WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
    … …  
    9696WK_IOSURFACE_ACCELERATOR_LDFLAGS_appletvos = $(WK_IOSURFACE_ACCELERATOR_LDFLAGS_iphoneos);
    9797
    98 WK_ANGLE_LDFLAGS = -weak-lANGLE-shared;
    99 
    10098WK_LIBWEBRTC_LDFLAGS = $(WK_LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
    10199WK_LIBWEBRTC_LDFLAGS_ENABLE_WEB_RTC = -framework VideoToolbox -framework CoreMedia -weak-lwebrtc;
    … …  
    128126
    129127// FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
    130 OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_ANGLE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
     128OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
    131129
    132130OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
    … …  
    142140
    143141NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
    144 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(WK_PLATFORM_NAME));
    145 NORMAL_WEBCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    146 NORMAL_WEBCORE_FRAMEWORKS_DIR_maccatalyst = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     142NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    147143
    148144WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));

  • branches/safari-610.1.1-branch/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

    r253824 r254570  
    4949DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug);
    5050
    51 ANGLE_LDFLAGS = -weak-lANGLE-shared;
    52 
    5351LIBWEBRTC_LDFLAGS = $(LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
    5452LIBWEBRTC_LDFLAGS_ = ;
    … …  
    5957EXPORTED_SYMBOLS_FILE = ;
    6058GCC_SYMBOLS_PRIVATE_EXTERN = YES;
     59OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
     60OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit $(LIBWEBRTC_LDFLAGS);
    6161
    62 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_LDFLAGS);
    63 OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit $(LIBWEBRTC_LDFLAGS) $(ANGLE_LDFLAGS);
    64 OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS) $(ANGLE_LDFLAGS);
    65 OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS) $(ANGLE_LDFLAGS);
    66 
     62OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS);
     63OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS);
    6764SECT_ORDER_FLAGS = ;

  • branches/safari-610.1.1-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r254373 r254570  
    3349133491                        runOnlyForDeploymentPostprocessing = 0;
    3349233492                        shellPath = /bin/sh;
    33493                         shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" && ${WK_PLATFORM_NAME} != \"maccatalyst\" ]]; then\n    exit 0\nfi\n\nif [[ ${WK_USE_OVERRIDE_FRAMEWORKS_DIR} == \"YES\" ]]; then\n    exit 0\nfi\n\n# ENABLE_WEB_RTC cannot be relied on because of its conditionals.\nif [[ ${CONFIGURATION} == \"Production\" && ${TARGET_MAC_OS_X_VERSION_MAJOR} < 101300 ]]; then\n    exit 0\nfi\n\nln -shf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebCore.framework/Frameworks\"\n";
     33493                        shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n    exit 0\nfi\n\nif [[ ${WK_USE_OVERRIDE_FRAMEWORKS_DIR} == \"YES\" ]]; then\n    exit 0\nfi\n\n# ENABLE_WEB_RTC cannot be relied on because of its conditionals.\nif [[ ${CONFIGURATION} == \"Production\" && ${TARGET_MAC_OS_X_VERSION_MAJOR} < 101300 ]]; then\n    exit 0\nfi\n\nln -shf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebCore.framework/Frameworks\"\n";
    3349433494                };
    3349533495                DD041FBD09D9DDBE0010AF2A /* Generate Derived Sources */ = {

  • branches/safari-610.1.1-branch/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp

    r254064 r254570  
    3232#include <wtf/StdLibExtras.h>
    3333
    34 #if PLATFORM(COCOA)
    35 #include <wtf/darwin/WeakLinking.h>
    36 #endif
    37 
    3834namespace WebCore {
    3935
    … …  
    136132    , m_shaderSpec(shaderSpec)
    137133{
    138     ASSERT(angleAvailable());
    139     if (!angleAvailable())
    140         return;
    141 
    142134    // This is a no-op if it's already initialized.
    143135    sh::Initialize();
    … …  
    151143void ANGLEWebKitBridge::cleanupCompilers()
    152144{
    153     ASSERT(ANGLEWebKitBridge::angleAvailable());
    154     if (!ANGLEWebKitBridge::angleAvailable())
    155         return;
    156 
    157145    if (m_fragmentCompiler)
    158146        sh::Destruct(m_fragmentCompiler);
    … …  
    175163bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, uint64_t extraCompileOptions)
    176164{
    177     ASSERT(ANGLEWebKitBridge::angleAvailable());
    178     if (!ANGLEWebKitBridge::angleAvailable())
    179         return false;
    180 
    181165    if (!builtCompilers) {
    182166        m_fragmentCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, m_shaderSpec, m_shaderOutput, &m_resources);
    … …  
    221205}
    222206
    223 bool ANGLEWebKitBridge::angleAvailable()
    224 {
    225 #if PLATFORM(COCOA)
    226     return !isNullFunctionPointer(sh::Compile);
    227 #else
    228     return true;
    229 #endif
    230 }
    231 
    232207}
    233208

  • branches/safari-610.1.1-branch/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h

    r254103 r254570  
    9191    bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, uint64_t extraCompileOptions = 0);
    9292
    93     static bool angleAvailable();
    94 
    9593private:
    9694

  • branches/safari-610.1.1-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

    r254214 r254570  
    187187    : GraphicsContextGL(attrs, destination, sharedContext)
    188188{
    189     ASSERT(ANGLEWebKitBridge::angleAvailable());
    190     if (!ANGLEWebKitBridge::angleAvailable())
    191         return;
    192 
    193189    m_isForWebGL2 = attrs.isWebGL2;
    194190
Note: See TracChangeset for help on using the changeset viewer.