Changeset 258972 in webkit

Timestamp:

Mar 24, 2020 9:05:49 PM (4 years ago)

Author:

Russell Epstein

Message:

Apply patch. rdar://problem/60756680

Location:

branches/safari-609-branch

Files:

• Source/WTF/WTF.xcodeproj/project.pbxproj (modified) (4 diffs)
• Source/WTF/wtf/PlatformMac.cmake (modified) (2 diffs)
• Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.cpp (added)
• Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h (added)
• Source/WebCore/platform/RuntimeApplicationChecks.h (modified) (1 diff)
• Source/WebCore/platform/Timer.cpp (modified) (1 diff)
• Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (1 diff)
• Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (2 diffs)
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)
• WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (modified) (1 diff)

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

@@ -62 +62 @@
                 1C181C961D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C181C951D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp */; };
                 1C503BE623AAE0AE0072E66B /* LanguageCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C503BE523AAE0AE0072E66B /* LanguageCocoa.mm */; };
+                1C9E1C8A242AA9BC00DEB5B2 /* RuntimeApplicationChecksCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */; };
                 1FA47C8A152502DA00568D1B /* WebCoreThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FA47C88152502DA00568D1B /* WebCoreThread.cpp */; };
                 2CCD892A15C0390200285083 /* GregorianDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CCD892915C0390200285083 /* GregorianDateTime.cpp */; };
@@ -343 +344 @@
                 1C503BE423AADEEA0072E66B /* NSLocaleSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSLocaleSPI.h; sourceTree = "<group>"; };
                 1C503BE523AAE0AE0072E66B /* LanguageCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LanguageCocoa.mm; sourceTree = "<group>"; };
+                1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeApplicationChecksCocoa.cpp; sourceTree = "<group>"; };
+                1C9E1C89242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuntimeApplicationChecksCocoa.h; sourceTree = "<group>"; };
                 1CCDB1491E566626006C73C0 /* TextBreakIteratorCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBreakIteratorCF.h; sourceTree = "<group>"; };
                 1CCDB14D1E566898006C73C0 /* TextBreakIteratorICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBreakIteratorICU.h; sourceTree = "<group>"; };
@@ -1471 +1474 @@
                         isa = PBXGroup;
                         children = (
+                                1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */,
+                                1C9E1C89242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.h */,
                                 1469419B16EAB10A0024E146 /* AutodrainedPool.cpp */,
                                 E38C41241EB4E04C0042957D /* CPUTimeCocoa.cpp */,
@@ -1594 +1599 @@
                                 A8A4739A151A825B004123FF /* CryptographicallyRandomNumber.cpp in Sources */,
                                 E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */,
+                                1C9E1C8A242AA9BC00DEB5B2 /* RuntimeApplicationChecksCocoa.cpp in Sources */,
                                 A8A47439151A825B004123FF /* CString.cpp in Sources */,
                                 A8A4739C151A825B004123FF /* CurrentTime.cpp in Sources */,

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

@@ -17 +17 @@
     cocoa/Entitlements.h
     cocoa/NSURLExtras.h
+    cocoa/RuntimeApplicationChecksCocoa.h
     cocoa/SoftLinking.h
 
@@ -65 +66 @@
     cocoa/NSURLExtras.mm
     cocoa/ResourceUsageCocoa.cpp
+    cocoa/RuntimeApplicationChecksCocoa.cpp
     cocoa/URLCocoa.mm
     cocoa/WorkQueueCocoa.cpp

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

@@ -43 +43 @@
 bool isInWebProcess();
 bool isInNetworkProcess();
-
-WEBCORE_EXPORT void setApplicationSDKVersion(uint32_t);
-WEBCORE_EXPORT uint32_t applicationSDKVersion();
 
 WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);

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

@@ -38 +38 @@
 
 #if PLATFORM(COCOA)
-#include <wtf/spi/darwin/dyldSPI.h>
+#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 #endif
 

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

@@ -67 +67 @@
 }
 
-static Optional<uint32_t>& applicationSDKVersionOverride()
-{
-    static NeverDestroyed<Optional<uint32_t>> version;
-    return version;
-}
-
-void setApplicationSDKVersion(uint32_t version)
-{
-    applicationSDKVersionOverride() = version;
-}
-
-uint32_t applicationSDKVersion()
-{
-    if (applicationSDKVersionOverride())
-        return *applicationSDKVersionOverride();
-    return dyld_get_program_sdk_version();
-}
-
 bool isInWebProcess()
 {

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

@@ -46 +46 @@
 #import <wtf/ProcessPrivilege.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 
 namespace WebKit {
@@ -72 +73 @@
 {
     WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
-    WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
+    setApplicationSDKVersion(parameters.uiProcessSDKVersion);
 
 #if HAVE(HSTS_STORAGE_PATH)

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

@@ -80 +80 @@
 #import <wtf/ProcessPrivilege.h>
 #import <wtf/cocoa/NSURLExtras.h>
+#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 
 #if PLATFORM(IOS)
@@ -164 +165 @@
 
     WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
-    WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
+    setApplicationSDKVersion(parameters.uiProcessSDKVersion);
 
     m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;

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

@@ -58 +58 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "FB39D0D01200F0E300088E69"
-               BuildableName = "libANGLE-shared.dylib"
+               BuildableName = "libANGLE.a"
                BlueprintName = "ANGLE"
                ReferencedContainer = "container:Source/ThirdParty/ANGLE/ANGLE.xcodeproj">