Diff
Modified: branches/safari-609-branch/Source/WTF/WTF.xcodeproj/project.pbxproj (259000 => 259001)
--- branches/safari-609-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-03-25 19:16:03 UTC (rev 259001)
@@ -61,7 +61,6 @@
1C181C931D307AB800F5FA16 /* UTextProviderUTF16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C181C8D1D307AB800F5FA16 /* UTextProviderUTF16.cpp */; };
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 */; };
2CDED0EF18115C38004DBA70 /* RunLoopCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0EE18115C38004DBA70 /* RunLoopCF.cpp */; };
@@ -343,8 +342,6 @@
1C181C951D30800A00F5FA16 /* TextBreakIteratorInternalICUCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextBreakIteratorInternalICUCocoa.cpp; sourceTree = "<group>"; };
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>"; };
1CCDB1511E566BC5006C73C0 /* CFStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFStringSPI.h; sourceTree = "<group>"; };
@@ -1473,8 +1470,6 @@
E4A0AD3B1A96251900536DF6 /* cocoa */ = {
isa = PBXGroup;
children = (
- 1C9E1C88242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.cpp */,
- 1C9E1C89242AA9A800DEB5B2 /* RuntimeApplicationChecksCocoa.h */,
1469419B16EAB10A0024E146 /* AutodrainedPool.cpp */,
E38C41241EB4E04C0042957D /* CPUTimeCocoa.cpp */,
CEA072A9236FFBF70018839C /* CrashReporter.cpp */,
@@ -1598,7 +1593,6 @@
517F82D71FD22F3000DA3DEA /* CrossThreadTaskHandler.cpp in Sources */,
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 */,
A8A4739E151A825B004123FF /* DataLog.cpp in Sources */,
Modified: branches/safari-609-branch/Source/WTF/wtf/PlatformMac.cmake (259000 => 259001)
--- branches/safari-609-branch/Source/WTF/wtf/PlatformMac.cmake 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WTF/wtf/PlatformMac.cmake 2020-03-25 19:16:03 UTC (rev 259001)
@@ -16,7 +16,6 @@
cocoa/CrashReporter.h
cocoa/Entitlements.h
cocoa/NSURLExtras.h
- cocoa/RuntimeApplicationChecksCocoa.h
cocoa/SoftLinking.h
darwin/WeakLinking.h
@@ -65,7 +64,6 @@
cocoa/MemoryPressureHandlerCocoa.mm
cocoa/NSURLExtras.mm
cocoa/ResourceUsageCocoa.cpp
- cocoa/RuntimeApplicationChecksCocoa.cpp
cocoa/URLCocoa.mm
cocoa/WorkQueueCocoa.cpp
Deleted: branches/safari-609-branch/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.cpp (259000 => 259001)
--- branches/safari-609-branch/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.cpp 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.cpp 2020-03-25 19:16:03 UTC (rev 259001)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011-2020 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
-
-#include <wtf/NeverDestroyed.h>
-#include <wtf/Optional.h>
-
-namespace WTF {
-
-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();
-}
-
-}
Deleted: branches/safari-609-branch/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h (259000 => 259001)
--- branches/safari-609-branch/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h 2020-03-25 19:16:03 UTC (rev 259001)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009-2020 Apple 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/Forward.h>
-
-// This contains the values with which to compare the return value of applicationSDKVersion().
-#include <wtf/spi/darwin/dyldSPI.h>
-
-namespace WTF {
-
-// dyld_get_program_sdk_version() gives you the wrong answer in any process other than the UI process.
-// These functions are hooked up to give you the right answer.
-WTF_EXPORT_PRIVATE void setApplicationSDKVersion(uint32_t);
-WTF_EXPORT_PRIVATE uint32_t applicationSDKVersion();
-
-}
-
-using WTF::setApplicationSDKVersion;
-using WTF::applicationSDKVersion;
Modified: branches/safari-609-branch/Source/WebCore/platform/RuntimeApplicationChecks.h (259000 => 259001)
--- branches/safari-609-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2020-03-25 19:16:03 UTC (rev 259001)
@@ -43,6 +43,9 @@
bool isInWebProcess();
bool isInNetworkProcess();
+WEBCORE_EXPORT void setApplicationSDKVersion(uint32_t);
+WEBCORE_EXPORT uint32_t applicationSDKVersion();
+
WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);
String applicationBundleIdentifier();
Modified: branches/safari-609-branch/Source/WebCore/platform/Timer.cpp (259000 => 259001)
--- branches/safari-609-branch/Source/WebCore/platform/Timer.cpp 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WebCore/platform/Timer.cpp 2020-03-25 19:16:03 UTC (rev 259001)
@@ -37,7 +37,7 @@
#include <wtf/Vector.h>
#if PLATFORM(COCOA)
-#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
+#include <wtf/spi/darwin/dyldSPI.h>
#endif
namespace WebCore {
Modified: branches/safari-609-branch/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (259000 => 259001)
--- branches/safari-609-branch/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm 2020-03-25 19:16:03 UTC (rev 259001)
@@ -66,6 +66,24 @@
applicationBundleIdentifierOverride() = bundleIdentifier;
}
+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()
{
static bool mainBundleIsWebProcess = [[[NSBundle mainBundle] bundleIdentifier] hasPrefix:@"com.apple.WebKit.WebContent"];
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (259000 => 259001)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-03-25 19:16:03 UTC (rev 259001)
@@ -45,7 +45,6 @@
#import <wtf/CallbackAggregator.h>
#import <wtf/ProcessPrivilege.h>
#import <wtf/RetainPtr.h>
-#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
namespace WebKit {
@@ -72,7 +71,7 @@
void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
{
WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
- setApplicationSDKVersion(parameters.uiProcessSDKVersion);
+ WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
#if HAVE(HSTS_STORAGE_PATH)
if (!parameters.hstsStorageDirectory.isNull()) {
Modified: branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (259000 => 259001)
--- branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-03-25 19:16:03 UTC (rev 259001)
@@ -79,7 +79,6 @@
#import <wtf/FileSystem.h>
#import <wtf/ProcessPrivilege.h>
#import <wtf/cocoa/NSURLExtras.h>
-#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
#if PLATFORM(IOS)
#import <WebCore/ParentalControlsContentFilter.h>
@@ -164,7 +163,7 @@
#endif
WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
- setApplicationSDKVersion(parameters.uiProcessSDKVersion);
+ WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
Modified: branches/safari-609-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (259000 => 259001)
--- branches/safari-609-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2020-03-25 18:34:21 UTC (rev 259000)
+++ branches/safari-609-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2020-03-25 19:16:03 UTC (rev 259001)
@@ -57,7 +57,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB39D0D01200F0E300088E69"
- BuildableName = "libANGLE.a"
+ BuildableName = "libANGLE-shared.dylib"
BlueprintName = "ANGLE"
ReferencedContainer = "container:Source/ThirdParty/ANGLE/ANGLE.xcodeproj">
</BuildableReference>