Diff
Modified: trunk/Tools/ChangeLog (266149 => 266150)
--- trunk/Tools/ChangeLog 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/ChangeLog 2020-08-25 22:26:07 UTC (rev 266150)
@@ -1,3 +1,32 @@
+2020-08-25 Alex Christensen <[email protected]>
+
+ Remove unneeded HAVE(NETWORK_FRAMEWORK) macro
+ https://bugs.webkit.org/show_bug.cgi?id=215824
+
+ Reviewed by Darin Adler.
+
+ This used to be needed for High Sierra support, which was before Network.framework was introduced.
+ Now, we can assume it is available on all Cocoa platforms.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Navigation.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/Preconnect.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadDelegate.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ * TestWebKitAPI/cocoa/HTTPServer.h:
+ * TestWebKitAPI/cocoa/HTTPServer.mm:
+ * TestWebKitAPI/config.h:
+
2020-08-25 Carlos Alberto Lopez Perez <[email protected]>
[WPE][Qt] Fix qt-wpe-minibrowser on Debian10
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2020-08-25 22:26:07 UTC (rev 266150)
@@ -50,12 +50,6 @@
WK_AUTHKIT_LDFLAGS_macosx = $(WK_AUTHKIT_LDFLAGS$(WK_MACOS_1015));
WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
-WK_NETWORK_LDFLAGS = $(WK_NETWORK_LDFLAGS_$(WK_PLATFORM_NAME));
-WK_NETWORK_LDFLAGS_iphoneos = -framework Network;
-WK_NETWORK_LDFLAGS_iphonesimulator = -framework Network;
-WK_NETWORK_LDFLAGS_macosx = $(WK_NETWORK_LDFLAGS$(WK_MACOS_1014));
-WK_NETWORK_LDFLAGS_MACOS_SINCE_1014 = -framework Network;
-
WK_PDFKIT_LDFLAGS = $(WK_PDFKIT_LDFLAGS_$(WK_PLATFORM_NAME));
WK_PDFKIT_LDFLAGS_macosx = -framework PDFKit;
WK_PDFKIT_LDFLAGS_iphoneos = -framework PDFKit;
@@ -67,7 +61,7 @@
OTHER_CPLUSPLUSFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit -lWebCoreTestSupport $(WK_AUTHKIT_LDFLAGS) $(WK_NETWORK_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_HID_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH));
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit -lWebCoreTestSupport $(WK_AUTHKIT_LDFLAGS) -framework Network $(WK_PDFKIT_LDFLAGS) $(WK_HID_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH));
OTHER_LDFLAGS_PLATFORM_ = -framework Cocoa -framework Carbon;
// FIXME: This should not be built on iOS. Instead we should create and use a TestWebKitAPI application.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -318,8 +318,6 @@
@end
-#if HAVE(NETWORK_FRAMEWORK)
-
TEST(Challenge, BasicProposedCredential)
{
using namespace TestWebKitAPI;
@@ -345,8 +343,6 @@
[[webView configuration].processPool _clearPermanentCredentialsForProtectionSpace:protectionSpace];
}
-#endif // HAVE(NETWORK_FRAMEWORK)
-
#if HAVE(SSL)
static void verifyCertificateAndPublicKey(SecTrustRef trust)
{
@@ -521,7 +517,7 @@
}
// FIXME: Find out why these tests time out on Mojave.
-#if HAVE(NETWORK_FRAMEWORK) && (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
static HTTPServer clientCertServer()
{
@@ -631,7 +627,7 @@
EXPECT_EQ(countClientCertChallenges(methods), 1u);
}
-#endif // HAVE(NETWORK_FRAMEWORK)
+#endif // !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
} // namespace TestWebKitAPI
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -1160,8 +1160,6 @@
Util::run(&isDone);
}
-#if HAVE(NETWORK_FRAMEWORK)
-
template<size_t length>
String longString(LChar c)
{
@@ -1287,8 +1285,6 @@
}
}
-#endif // HAVE(NETWORK_FRAMEWORK)
-
@interface DownloadTestSchemeDelegate : NSObject <WKNavigationDelegate>
@end
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -30,7 +30,7 @@
#import "TestWKWebView.h"
#import <wtf/text/StringConcatenateNumbers.h>
-#if ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(NETWORK_FRAMEWORK)
+#if ENABLE(VIDEO) && USE(AVFOUNDATION)
namespace TestWebKitAPI {
@@ -118,4 +118,4 @@
}
-#endif
+#endif // ENABLE(VIDEO) && USE(AVFOUNDATION)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Navigation.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Navigation.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Navigation.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -121,7 +121,6 @@
TestWebKitAPI::Util::run(&done);
}
-#if HAVE(NETWORK_FRAMEWORK)
TEST(WKNavigation, UserAgentAndAccept)
{
using namespace TestWebKitAPI;
@@ -140,7 +139,6 @@
[webView loadRequest:server.request()];
TestWebKitAPI::Util::run(&done);
}
-#endif
@interface FrameNavigationDelegate : NSObject <WKNavigationDelegate>
- (void)waitForNavigations:(size_t)count;
@@ -716,8 +714,6 @@
#endif // PLATFORM(MAC)
-#if HAVE(NETWORK_FRAMEWORK)
-
@interface LoadingObserver : NSObject
@property (nonatomic, readonly) size_t changesObserved;
@end
@@ -776,5 +772,3 @@
[webView removeObserver:observer forKeyPath:@"loading"];
}
-
-#endif // HAVE(NETWORK_FRAMEWORK)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -47,8 +47,6 @@
EXPECT_FALSE([pool _networkProcessHasEntitlementForTesting:@"test failure case"]);
}
-#if HAVE(NETWORK_FRAMEWORK)
-
TEST(WebKit, HTTPReferer)
{
auto checkReferer = [] (NSURL *baseURL, const char* expectedReferer) {
@@ -80,5 +78,3 @@
checkReferer([NSURL URLWithString:longHost], nullptr);
checkReferer([NSURL URLWithString:shorterHost], shorterHost.UTF8String);
}
-
-#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Preconnect.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Preconnect.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Preconnect.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -25,8 +25,6 @@
#import "config.h"
-#if HAVE(NETWORK_FRAMEWORK)
-
#import "HTTPServer.h"
#import "PlatformUtilities.h"
#import "TestNavigationDelegate.h"
@@ -234,5 +232,3 @@
#endif // HAVE(PRECONNECT_PING)
}
-
-#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -25,8 +25,6 @@
#import "config.h"
-#if HAVE(SSL)
-
#import "HTTPServer.h"
#import "PlatformUtilities.h"
#import "TCPServer.h"
@@ -40,6 +38,8 @@
#import <wtf/RetainPtr.h>
#import <wtf/text/StringConcatenateNumbers.h>
+#if HAVE(SSL)
+
@interface ProxyDelegate : NSObject <WKNavigationDelegate, WKUIDelegate>
- (NSString *)waitForAlert;
@end
@@ -183,8 +183,6 @@
#endif // HAVE(SSL)
-#if HAVE(NETWORK_FRAMEWORK)
-
namespace TestWebKitAPI {
TEST(WebKit, RelaxThirdPartyCookieBlocking)
@@ -274,5 +272,3 @@
}
} // namespace TestWebKitAPI
-
-#endif // HAVE(NETWORK_FRAMEWORK)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadDelegate.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadDelegate.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadDelegate.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -107,8 +107,6 @@
EXPECT_WK_STREQ(requestLoaded.get().URL.absoluteString, requestFromDelegate.get().URL.absoluteString);
}
-#if HAVE(NETWORK_FRAMEWORK)
-
TEST(ResourceLoadDelegate, BeaconAndSyncXHR)
{
TestWebKitAPI::HTTPServer server({
@@ -420,5 +418,3 @@
TestWebKitAPI::Util::run(&receivedErrorNotification);
EXPECT_TRUE(receivedChallengeNotificiation);
}
-
-#endif // HAVE(NETWORK_FRAMEWORK)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -52,10 +52,7 @@
#import <wtf/text/WTFString.h>
static bool done;
-
-#if HAVE(NETWORK_FRAMEWORK)
static bool didFinishNavigation;
-#endif
static String expectedMessage;
static String retrievedString;
@@ -1577,8 +1574,6 @@
waitUntilServiceWorkerProcessCount(processPool, 2);
}
-#if HAVE(NETWORK_FRAMEWORK)
-
static size_t launchServiceWorkerProcess(bool useSeparateServiceWorkerProcess, bool loadAboutBlankBeforePage)
{
[WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
@@ -1641,8 +1636,6 @@
EXPECT_EQ(2u, launchServiceWorkerProcess(useSeparateServiceWorkerProcess, firstLoadAboutBlank));
}
-#endif // HAVE(NETWORK_FRAMEWORK)
-
void waitUntilServiceWorkerProcessForegroundActivityState(WKWebView *page, bool shouldHaveActivity)
{
do {
@@ -1737,9 +1730,6 @@
testSuspendServiceWorkerProcessBasedOnClientProcesses(useSeparateServiceWorkerProcess);
}
-
-#if HAVE(NETWORK_FRAMEWORK)
-
TEST(ServiceWorkers, ThrottleCrash)
{
[WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
@@ -1804,8 +1794,6 @@
TestWebKitAPI::Util::run(&didFinishNavigation);
}
-#endif // HAVE(NETWORK_FRAMEWORK)
-
TEST(ServiceWorkers, LoadData)
{
[WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
@@ -2114,7 +2102,7 @@
TestWebKitAPI::Util::run(&doneRemoving);
}
-#if HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
+#if HAVE(TLS_PROTOCOL_VERSION_T)
static bool isTestServerTrust(SecTrustRef trust)
{
@@ -2296,4 +2284,4 @@
}
}
-#endif // HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
+#endif // HAVE(TLS_PROTOCOL_VERSION_T)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -45,7 +45,6 @@
#import <WebKit/WebCoreThread.h>
#endif
-#if HAVE(TLS_PROTOCOL_VERSION_T) || HAVE(NETWORK_FRAMEWORK)
@interface TLSObserver : NSObject
- (void)waitUntilNegotiatedLegacyTLSChanged;
@end
@@ -68,7 +67,6 @@
}
@end
-#endif
@interface TLSNavigationDelegate : NSObject <WKNavigationDelegate>
- (void)waitForDidFinishNavigation;
@@ -144,7 +142,7 @@
const uint16_t tls1_1 = 0x0302;
static NSString *defaultsKey = @"WebKitEnableLegacyTLS";
-#if HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
+#if HAVE(TLS_PROTOCOL_VERSION_T)
TEST(TLSVersion, DefaultBehavior)
{
@@ -160,7 +158,7 @@
[delegate waitForDidFinishNavigation];
}
-#endif // HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
+#endif // HAVE(TLS_PROTOCOL_VERSION_T)
#if HAVE(TLS_VERSION_DURING_CHALLENGE)
@@ -269,7 +267,7 @@
#endif // HAVE(TLS_VERSION_DURING_CHALLENGE)
-#if HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
+#if HAVE(TLS_PROTOCOL_VERSION_T)
static std::pair<RetainPtr<WKWebView>, RetainPtr<TestNavigationDelegate>> webViewWithNavigationDelegate()
{
@@ -505,7 +503,7 @@
#endif // HAVE(TLS_VERSION_DURING_CHALLENGE)
-#endif // HAVE(NETWORK_FRAMEWORK) && HAVE(TLS_PROTOCOL_VERSION_T)
+#endif // HAVE(TLS_PROTOCOL_VERSION_T)
}
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -831,8 +831,6 @@
EXPECT_FALSE(corsfailure);
}
-#if HAVE(NETWORK_FRAMEWORK)
-
TEST(URLSchemeHandler, DisableCORS)
{
TestWebKitAPI::HTTPServer server({
@@ -1206,8 +1204,6 @@
}
}
-#endif // HAVE(NETWORK_FRAMEWORK)
-
@interface FrameSchemeHandler : NSObject <WKURLSchemeHandler>
- (void)waitForAllRequests;
- (void)setExpectedWebView:(WKWebView *)webView;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -359,7 +359,7 @@
}
// FIXME: Re-enable this test for iOS once webkit.org/b/207874 is resolved
-#if HAVE(NETWORK_FRAMEWORK) && !PLATFORM(IOS)
+#if !PLATFORM(IOS)
TEST(WebKit, AllowsContentJavaScript)
{
RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -675,8 +675,6 @@
EXPECT_FALSE(error);
}
-#if HAVE(NETWORK_FRAMEWORK)
-
TEST(WebKit, ApplicationCacheDirectories)
{
TestWebKitAPI::HTTPServer server({
@@ -778,8 +776,6 @@
#endif // HAVE(CFNETWORK_ALTERNATIVE_SERVICE)
-#endif // HAVE(NETWORK_FRAMEWORK)
-
TEST(WebKit, MediaCache)
{
JSC::Config::configureForTesting();
Modified: trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.h 2020-08-25 22:26:07 UTC (rev 266150)
@@ -25,14 +25,11 @@
#pragma once
-#import <wtf/RetainPtr.h>
-
-#if HAVE(NETWORK_FRAMEWORK)
-
#import <Network/Network.h>
#import <wtf/CompletionHandler.h>
#import <wtf/Forward.h>
#import <wtf/HashMap.h>
+#import <wtf/RetainPtr.h>
#import <wtf/text/StringHash.h>
namespace TestWebKitAPI {
@@ -168,7 +165,5 @@
} // namespace TestWebKitAPI
-#endif // HAVE(NETWORK_FRAMEWORK)
-
RetainPtr<SecIdentityRef> testIdentity();
RetainPtr<SecIdentityRef> testIdentity2();
Modified: trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/cocoa/HTTPServer.mm 2020-08-25 22:26:07 UTC (rev 266150)
@@ -26,8 +26,6 @@
#import "config.h"
#import "HTTPServer.h"
-#if HAVE(NETWORK_FRAMEWORK)
-
#import "Utilities.h"
#import <wtf/BlockPtr.h>
#import <wtf/CompletionHandler.h>
@@ -410,5 +408,3 @@
}
} // namespace TestWebKitAPI
-
-#endif // HAVE(NETWORK_FRAMEWORK)
Modified: trunk/Tools/TestWebKitAPI/config.h (266149 => 266150)
--- trunk/Tools/TestWebKitAPI/config.h 2020-08-25 22:20:33 UTC (rev 266149)
+++ trunk/Tools/TestWebKitAPI/config.h 2020-08-25 22:26:07 UTC (rev 266150)
@@ -123,12 +123,6 @@
#endif
// FIXME: Move this to PlatformHave.h.
-// FIXME: Seems like this should be on for watchOS and tvOS too.
-#if PLATFORM(MAC) || PLATFORM(IOS)
-#define HAVE_NETWORK_FRAMEWORK 1
-#endif
-
-// FIXME: Move this to PlatformHave.h.
#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500)
#define HAVE_TLS_PROTOCOL_VERSION_T 1
#endif
