Changeset 259001 in webkit


Ignore:
Timestamp:
Mar 25, 2020 12:16:03 PM (4 years ago)
Author:
Russell Epstein
Message:

Revert "Apply patch. rdar://problem/60756680"

This reverts commit r258972.

Location:
branches/safari-609-branch
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-609-branch/Source/WTF/WTF.xcodeproj/project.pbxproj

    r258972 r259001  
    6262                1C181C961D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C181C951D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp */; };
    6363                1C503BE623AAE0AE0072E66B /* LanguageCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C503BE523AAE0AE0072E66B /* LanguageCocoa.mm */; };
    64                 1C9E1C8A242AA9BC00DEB5B2 /* RuntimeApplicationChecksCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */; };
    6564                1FA47C8A152502DA00568D1B /* WebCoreThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FA47C88152502DA00568D1B /* WebCoreThread.cpp */; };
    6665                2CCD892A15C0390200285083 /* GregorianDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CCD892915C0390200285083 /* GregorianDateTime.cpp */; };
    … …  
    344343                1C503BE423AADEEA0072E66B /* NSLocaleSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSLocaleSPI.h; sourceTree = "<group>"; };
    345344                1C503BE523AAE0AE0072E66B /* LanguageCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LanguageCocoa.mm; sourceTree = "<group>"; };
    346                 1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeApplicationChecksCocoa.cpp; sourceTree = "<group>"; };
    347                 1C9E1C89242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuntimeApplicationChecksCocoa.h; sourceTree = "<group>"; };
    348345                1CCDB1491E566626006C73C0 /* TextBreakIteratorCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBreakIteratorCF.h; sourceTree = "<group>"; };
    349346                1CCDB14D1E566898006C73C0 /* TextBreakIteratorICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBreakIteratorICU.h; sourceTree = "<group>"; };
    … …  
    14741471                        isa = PBXGroup;
    14751472                        children = (
    1476                                 1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */,
    1477                                 1C9E1C89242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.h */,
    14781473                                1469419B16EAB10A0024E146 /* AutodrainedPool.cpp */,
    14791474                                E38C41241EB4E04C0042957D /* CPUTimeCocoa.cpp */,
    … …  
    15991594                                A8A4739A151A825B004123FF /* CryptographicallyRandomNumber.cpp in Sources */,
    16001595                                E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */,
    1601                                 1C9E1C8A242AA9BC00DEB5B2 /* RuntimeApplicationChecksCocoa.cpp in Sources */,
    16021596                                A8A47439151A825B004123FF /* CString.cpp in Sources */,
    16031597                                A8A4739C151A825B004123FF /* CurrentTime.cpp in Sources */,

  • branches/safari-609-branch/Source/WTF/wtf/PlatformMac.cmake

    r258972 r259001  
    1717    cocoa/Entitlements.h
    1818    cocoa/NSURLExtras.h
    19     cocoa/RuntimeApplicationChecksCocoa.h
    2019    cocoa/SoftLinking.h
    2120
    … …  
    6665    cocoa/NSURLExtras.mm
    6766    cocoa/ResourceUsageCocoa.cpp
    68     cocoa/RuntimeApplicationChecksCocoa.cpp
    6967    cocoa/URLCocoa.mm
    7068    cocoa/WorkQueueCocoa.cpp

  • branches/safari-609-branch/Source/WebCore/platform/RuntimeApplicationChecks.h

    r258972 r259001  
    4343bool isInWebProcess();
    4444bool isInNetworkProcess();
     45
     46WEBCORE_EXPORT void setApplicationSDKVersion(uint32_t);
     47WEBCORE_EXPORT uint32_t applicationSDKVersion();
    4548
    4649WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);

  • branches/safari-609-branch/Source/WebCore/platform/Timer.cpp

    r258972 r259001  
    3838
    3939#if PLATFORM(COCOA)
    40 #include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
     40#include <wtf/spi/darwin/dyldSPI.h>
    4141#endif
    4242

  • branches/safari-609-branch/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm

    r258972 r259001  
    6767}
    6868
     69static Optional<uint32_t>& applicationSDKVersionOverride()
     70{
     71    static NeverDestroyed<Optional<uint32_t>> version;
     72    return version;
     73}
     74
     75void setApplicationSDKVersion(uint32_t version)
     76{
     77    applicationSDKVersionOverride() = version;
     78}
     79
     80uint32_t applicationSDKVersion()
     81{
     82    if (applicationSDKVersionOverride())
     83        return *applicationSDKVersionOverride();
     84    return dyld_get_program_sdk_version();
     85}
     86
    6987bool isInWebProcess()
    7088{

  • branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r258972 r259001  
    4646#import <wtf/ProcessPrivilege.h>
    4747#import <wtf/RetainPtr.h>
    48 #import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
    4948
    5049namespace WebKit {
    … …  
    7372{
    7473    WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
    75     setApplicationSDKVersion(parameters.uiProcessSDKVersion);
     74    WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
    7675
    7776#if HAVE(HSTS_STORAGE_PATH)

  • branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r258972 r259001  
    8080#import <wtf/ProcessPrivilege.h>
    8181#import <wtf/cocoa/NSURLExtras.h>
    82 #import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
    8382
    8483#if PLATFORM(IOS)
    … …  
    165164
    166165    WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
    167     setApplicationSDKVersion(parameters.uiProcessSDKVersion);
     166    WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
    168167
    169168    m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;

  • branches/safari-609-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme

    r258972 r259001  
    5858               BuildableIdentifier = "primary"
    5959               BlueprintIdentifier = "FB39D0D01200F0E300088E69"
    60                BuildableName = "libANGLE.a"
     60               BuildableName = "libANGLE-shared.dylib"
    6161               BlueprintName = "ANGLE"
    6262               ReferencedContainer = "container:Source/ThirdParty/ANGLE/ANGLE.xcodeproj">
Note: See TracChangeset for help on using the changeset viewer.