Diff
Modified: trunk/Source/WebCore/ChangeLog (264810 => 264811)
--- trunk/Source/WebCore/ChangeLog 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/ChangeLog 2020-07-24 05:04:38 UTC (rev 264811)
@@ -1,5 +1,32 @@
2020-07-23 Alex Christensen <achristen...@webkit.org>
+ Split Windows parts from CFNetworkSPI.h to CFNetworkSPIWin.h
+ https://bugs.webkit.org/show_bug.cgi?id=214719
+
+ Reviewed by Tim Horton.
+
+ No change in behavior.
+ Windows CFNetwork work is not actively developed, but Cocoa is.
+ This makes it easier to find where to put new things.
+
+ * platform/network/NetworkStorageSession.h:
+ * platform/network/ResourceHandleClient.h:
+ * platform/network/ResourceHandleInternal.h:
+ * platform/network/cf/CookieStorageCFNet.cpp:
+ * platform/network/cf/CredentialStorageCFNet.cpp:
+ * platform/network/cf/NetworkStorageSessionCFNetWin.cpp:
+ * platform/network/cf/ResourceErrorCF.cpp:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
+ * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ * platform/network/cf/ResourceRequestCFNet.h:
+ * platform/network/cf/ResourceResponse.h:
+ * platform/network/cf/ResourceResponseCFNet.cpp:
+ * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+
+2020-07-23 Alex Christensen <achristen...@webkit.org>
+
Remove dead code in ResourceHandleCFNet.cpp
https://bugs.webkit.org/show_bug.cgi?id=214717
Modified: trunk/Source/WebCore/PAL/ChangeLog (264810 => 264811)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-07-24 05:04:38 UTC (rev 264811)
@@ -1,3 +1,14 @@
+2020-07-23 Alex Christensen <achristen...@webkit.org>
+
+ Split Windows parts from CFNetworkSPI.h to CFNetworkSPIWin.h
+ https://bugs.webkit.org/show_bug.cgi?id=214719
+
+ Reviewed by Tim Horton.
+
+ * pal/PlatformAppleWin.cmake:
+ * pal/spi/cf/CFNetworkSPI.h:
+ * pal/spi/win/CFNetworkSPIWin.h: Added.
+
2020-07-22 Conrad Shultz <conrad_shu...@apple.com>
Update macOS Version macros
Modified: trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake (264810 => 264811)
--- trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake 2020-07-24 05:04:38 UTC (rev 264811)
@@ -5,11 +5,11 @@
spi/cf/CFLocaleSPI.h
spi/cf/CFNetworkConnectionCacheSPI.h
- spi/cf/CFNetworkSPI.h
spi/cf/CFUtilitiesSPI.h
spi/cf/CoreAudioSPI.h
spi/cf/CoreMediaSPI.h
+ spi/win/CFNetworkSPIWin.h
spi/win/CoreTextSPIWin.h
)
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (264810 => 264811)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-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
@@ -30,11 +30,12 @@
#include <CFNetwork/CFNetwork.h>
#include <pal/spi/cf/CFNetworkConnectionCacheSPI.h>
-#if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK)
#include <CFNetwork/CFHTTPCookiesPriv.h>
#include <CFNetwork/CFHTTPStream.h>
#include <CFNetwork/CFProxySupportPriv.h>
+#include <CFNetwork/CFSocketStreamPriv.h>
#include <CFNetwork/CFURLCachePriv.h>
#include <CFNetwork/CFURLConnectionPriv.h>
#include <CFNetwork/CFURLCredentialStorage.h>
@@ -42,23 +43,7 @@
#include <CFNetwork/CFURLRequestPriv.h>
#include <CFNetwork/CFURLResponsePriv.h>
#include <CFNetwork/CFURLStorageSession.h>
-
-#if PLATFORM(WIN)
-
-WTF_EXTERN_C_BEGIN
-
-CFN_EXPORT CFStringRef _CFNetworkErrorGetLocalizedDescription(CFIndex);
-
-extern const CFStringRef _kCFWindowsSSLLocalCert;
-extern const CFStringRef _kCFStreamPropertyWindowsSSLCertInfo;
-extern const CFStringRef _kCFWindowsSSLPeerCert;
-
-WTF_EXTERN_C_END
-
-#else // !PLATFORM(WIN)
-#include <CFNetwork/CFSocketStreamPriv.h>
#include <nw/private.h>
-#endif // PLATFORM(WIN)
// FIXME: Remove the defined(__OBJC__)-guard once we fix <rdar://problem/19033610>.
#if defined(__OBJC__) && PLATFORM(COCOA)
@@ -65,7 +50,7 @@
#import <CFNetwork/CFNSURLConnection.h>
#endif
-#else // !PLATFORM(WIN) && !USE(APPLE_INTERNAL_SDK)
+#else // !USE(APPLE_INTERNAL_SDK)
#if HAVE(PRECONNECT_PING) && defined(__OBJC__)
@@ -129,10 +114,6 @@
CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
};
-#ifdef __BLOCKS__
-typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
-#endif
-
#if defined(__OBJC__)
@interface NSURLSessionTask ()
@@ -311,36 +292,33 @@
extern NSString * const NSURLAuthenticationMethodOAuth;
+enum : NSUInteger {
+ NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
+};
+
#endif // defined(__OBJC__)
-#endif // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
+#endif // USE(APPLE_INTERNAL_SDK)
WTF_EXTERN_C_BEGIN
-#if !PLATFORM(WIN)
+#ifdef __BLOCKS__
+typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
+void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
+#endif
CFURLStorageSessionRef _CFURLStorageSessionCreate(CFAllocatorRef, CFStringRef, CFDictionaryRef);
CFURLCacheRef _CFURLStorageSessionCopyCache(CFAllocatorRef, CFURLStorageSessionRef);
-
void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
-
CFURLCacheRef CFURLCacheCopySharedURLCache();
void CFURLCacheSetMemoryCapacity(CFURLCacheRef, CFIndex memoryCapacity);
CFIndex CFURLCacheMemoryCapacity(CFURLCacheRef);
void CFURLCacheSetDiskCapacity(CFURLCacheRef, CFIndex);
CFCachedURLResponseRef CFURLCacheCopyResponseForRequest(CFURLCacheRef, CFURLRequestRef);
-
void CFHTTPCookieStorageDeleteAllCookies(CFHTTPCookieStorageRef);
void _CFHTTPCookieStorageFlushCookieStores();
-
-#if PLATFORM(COCOA)
CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
-#endif
-#if PLATFORM(COCOA) && defined(__BLOCKS__)
-void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
-#endif
-
extern CFStringRef const kCFHTTPCookieLocalFileDomain;
extern const CFStringRef kCFHTTPVersion1_1;
extern const CFStringRef kCFURLRequestAllowAllPOSTCaching;
@@ -398,8 +376,6 @@
void _CFNetworkSetHSTSStoragePath(CFStringRef);
#endif
-#endif // !PLATFORM(WIN)
-
CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxy;
CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyHost;
CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyPort;
@@ -409,22 +385,9 @@
CFN_EXPORT void _CFHTTPMessageSetResponseURL(CFHTTPMessageRef, CFURLRef);
CFN_EXPORT void _CFHTTPMessageSetResponseProxyURL(CFHTTPMessageRef, CFURLRef);
-WTF_EXTERN_C_END
-
-#if defined(__OBJC__) && !USE(APPLE_INTERNAL_SDK)
-
-enum : NSUInteger {
- NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
-};
-
-#endif
-
-WTF_EXTERN_C_BEGIN
-
CFDataRef _CFNetworkCopyATSContext(void);
Boolean _CFNetworkSetATSContext(CFDataRef);
-#if PLATFORM(COCOA)
extern const CFStringRef _kCFNetworkHSTSPreloaded;
CFDictionaryRef _CFNetworkCopyHSTSPolicies(CFURLStorageSessionRef);
void _CFNetworkResetHSTS(CFURLRef, CFURLStorageSessionRef);
@@ -431,7 +394,6 @@
void _CFNetworkResetHSTSHostsSinceDate(CFURLStorageSessionRef, CFDateRef);
Boolean _CFNetworkIsKnownHSTSHostWithSession(CFURLRef, CFURLStorageSessionRef);
void _CFNetworkResetHSTSHostsWithSession(CFURLStorageSessionRef);
-#endif
CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPIWin.cpp (264810 => 264811)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPIWin.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPIWin.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -26,7 +26,7 @@
#if PLATFORM(WIN) && USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
const CFStringRef _kCFWindowsSSLLocalCert = CFSTR("_kCFWindowsSSLLocalCert");
const CFStringRef _kCFWindowsSSLPeerCert = CFSTR("_kCFWindowsSSLPeerCert");
Added: trunk/Source/WebCore/PAL/pal/spi/win/CFNetworkSPIWin.h (0 => 264811)
--- trunk/Source/WebCore/PAL/pal/spi/win/CFNetworkSPIWin.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/win/CFNetworkSPIWin.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2014-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.
+ */
+
+#pragma once
+
+#include <CFNetwork/CFNetwork.h>
+#include <pal/spi/cf/CFNetworkConnectionCacheSPI.h>
+
+#include <CFNetwork/CFHTTPCookiesPriv.h>
+#include <CFNetwork/CFHTTPStream.h>
+#include <CFNetwork/CFProxySupportPriv.h>
+#include <CFNetwork/CFURLCachePriv.h>
+#include <CFNetwork/CFURLConnectionPriv.h>
+#include <CFNetwork/CFURLCredentialStorage.h>
+#include <CFNetwork/CFURLProtocolPriv.h>
+#include <CFNetwork/CFURLRequestPriv.h>
+#include <CFNetwork/CFURLResponsePriv.h>
+#include <CFNetwork/CFURLStorageSession.h>
+
+WTF_EXTERN_C_BEGIN
+
+CFN_EXPORT CFStringRef _CFNetworkErrorGetLocalizedDescription(CFIndex);
+
+extern const CFStringRef _kCFWindowsSSLLocalCert;
+extern const CFStringRef _kCFStreamPropertyWindowsSSLCertInfo;
+extern const CFStringRef _kCFWindowsSSLPeerCert;
+
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxy;
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyHost;
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyPort;
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTAdditionalHeaders;
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTResponse;
+CFN_EXPORT void _CFHTTPMessageSetResponseURL(CFHTTPMessageRef, CFURLRef);
+CFN_EXPORT void _CFHTTPMessageSetResponseProxyURL(CFHTTPMessageRef, CFURLRef);
+
+WTF_EXTERN_C_END
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (264810 => 264811)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -39,10 +39,15 @@
#include <wtf/text/WTFString.h>
#if PLATFORM(COCOA) || USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
#include <wtf/RetainPtr.h>
#endif
+#if PLATFORM(COCOA)
+#include <pal/spi/cf/CFNetworkSPI.h>
+#elif USE(CFURLCONNECTION)
+#include <pal/spi/win/CFNetworkSPIWin.h>
+#endif
+
#if USE(SOUP)
#include <wtf/Function.h>
#include <wtf/glib/GRefPtr.h>
Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (264810 => 264811)
--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -30,7 +30,7 @@
#include <wtf/Ref.h>
#if USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
#if PLATFORM(IOS_FAMILY) || USE(CFURLCONNECTION)
Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (264810 => 264811)
--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -34,7 +34,7 @@
#if USE(CFURLCONNECTION)
#include "ResourceHandleCFURLConnectionDelegate.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
#if USE(CURL)
Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -29,7 +29,7 @@
#include "LoaderRunLoopCF.h"
#include "NetworkStorageSession.h"
#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <wtf/Function.h>
#include <wtf/HashMap.h>
#include <wtf/MainThread.h>
Modified: trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -31,7 +31,7 @@
#include "AuthenticationCF.h"
#include "Credential.h"
#include "ProtectionSpace.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <wtf/RetainPtr.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNetWin.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -32,7 +32,7 @@
#include "NotImplemented.h"
#include <CFNetwork/CFHTTPCookiesPriv.h>
#include <CoreFoundation/CoreFoundation.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <windows.h>
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -30,7 +30,7 @@
#include <CoreFoundation/CFError.h>
#include <CFNetwork/CFNetworkErrors.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <wtf/RetainPtr.h>
#include <wtf/URL.h>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -44,7 +44,7 @@
#include "SharedBuffer.h"
#include "SynchronousLoaderClient.h"
#include <CFNetwork/CFNetwork.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <wtf/CompletionHandler.h>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -31,7 +31,7 @@
#include "FormDataStreamCFNet.h"
#include "NetworkingContext.h"
#include "ResourceHandle.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -37,10 +37,7 @@
#include "ResourceResponse.h"
#include "SharedBuffer.h"
#include "SynchronousLoaderClient.h"
-#if !PLATFORM(WIN)
-#include "WebCoreURLResponse.h"
-#endif
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <wtf/CompletionHandler.h>
#include <wtf/MainThread.h>
#include <wtf/Threading.h>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -29,7 +29,6 @@
#include "HTTPHeaderNames.h"
#include "RegistrableDomain.h"
#include "ResourceRequest.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
#include <wtf/cf/TypeCastsCF.h>
#if ENABLE(PUBLIC_SUFFIX_LIST)
@@ -39,6 +38,7 @@
#if USE(CFURLCONNECTION)
#include "FormDataStreamCFNet.h"
#include <CFNetwork/CFURLRequestPriv.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <wtf/text/CString.h>
#endif
@@ -45,6 +45,7 @@
#if PLATFORM(COCOA)
#include "ResourceLoadPriority.h"
#include <dlfcn.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
#endif
WTF_DECLARE_CF_TYPE_TRAIT(CFURL);
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -27,7 +27,12 @@
#include "ResourceLoadPriority.h"
#include "ResourceRequestBase.h"
+
+#if USE(CFURLCONNECTION)
+#include <pal/spi/win/CFNetworkSPIWin.h>
+#elif PLATFORM(COCOA)
#include <pal/spi/cf/CFNetworkSPI.h>
+#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponse.h (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2020-07-24 05:04:38 UTC (rev 264811)
@@ -29,7 +29,7 @@
#include <wtf/RetainPtr.h>
#if USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
OBJC_CLASS NSURLResponse;
Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -28,7 +28,7 @@
#if USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include "HTTPParsers.h"
#include "MIMETypeRegistry.h"
Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp (264810 => 264811)
--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -51,7 +51,7 @@
#if PLATFORM(WIN)
#include "LoaderRunLoopCF.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
#if PLATFORM(IOS_FAMILY)
@@ -64,7 +64,7 @@
#endif
#if PLATFORM(COCOA)
-#import <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
#endif
#if PLATFORM(WIN)
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2020-07-24 05:04:38 UTC (rev 264811)
@@ -1,3 +1,17 @@
+2020-07-23 Alex Christensen <achristen...@webkit.org>
+
+ Split Windows parts from CFNetworkSPI.h to CFNetworkSPIWin.h
+ https://bugs.webkit.org/show_bug.cgi?id=214719
+
+ Reviewed by Tim Horton.
+
+ * WebCache.cpp:
+ * WebCoreSupport/WebFrameNetworkingContext.cpp:
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+ * WebError.cpp:
+ * WebURLResponse.cpp:
+ * WebView.cpp:
+
2020-07-19 Darin Adler <da...@apple.com>
Remove live ranges from Editor.h and EditorClient.h
Modified: trunk/Source/WebKitLegacy/win/WebCache.cpp (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/WebCache.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/WebCache.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -37,7 +37,7 @@
#include <WebCore/CurlCacheManager.h>
#elif USE(CFURLCONNECTION)
#include <CFNetwork/CFURLCachePriv.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
using namespace WebCore;
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -37,7 +37,7 @@
#if USE(CFURLCONNECTION)
#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
using namespace WebCore;
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -37,7 +37,7 @@
#include <WebCore/PageGroup.h>
#if USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
using namespace WebCore;
Modified: trunk/Source/WebKitLegacy/win/WebError.cpp (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/WebError.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/WebError.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -34,7 +34,7 @@
#endif
#if USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
using namespace WebCore;
Modified: trunk/Source/WebKitLegacy/win/WebURLResponse.cpp (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/WebURLResponse.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/WebURLResponse.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -36,7 +36,7 @@
#endif
#if USE(CFURLCONNECTION)
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#endif
#include <WebCore/BString.h>
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (264810 => 264811)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2020-07-24 04:48:53 UTC (rev 264810)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2020-07-24 05:04:38 UTC (rev 264811)
@@ -190,7 +190,7 @@
#if USE(CFURLCONNECTION)
#include <CFNetwork/CFURLCachePriv.h>
#include <CFNetwork/CFURLProtocolPriv.h>
-#include <pal/spi/cf/CFNetworkSPI.h>
+#include <pal/spi/win/CFNetworkSPIWin.h>
#include <wtf/cf/CFURLExtras.h>
#elif USE(CURL)
#include <WebCore/CurlCacheManager.h>
