Remove Cocoa CFURLConnection loading code
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Nov 2017 22:20:42 +0000 (22:20 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Nov 2017 22:20:42 +0000 (22:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179688

Reviewed by Antti Koivisto.

Source/WebCore:

CFURLConnection is only used on the AppleWin port now.

* PlatformMac.cmake:
* SourcesCocoa.txt:
* SourcesIOS.txt:
* WebCore.xcodeproj/project.pbxproj:
* loader/DocumentLoader.h:
* loader/EmptyFrameLoaderClient.h:
* loader/FrameLoaderClient.h:
* loader/ResourceLoader.cpp:
* loader/ResourceLoader.h:
* loader/SubresourceLoader.h:
* loader/cf/ResourceLoaderCFNet.cpp:
* loader/cocoa/SubresourceLoaderCocoa.mm:
* loader/mac/DocumentLoaderMac.cpp:
* loader/mac/ResourceLoaderMac.mm:
* page/mac/PageMac.mm:
(WebCore::Page::platformInitialize):
(WebCore::Page::addSchedulePair):
(WebCore::Page::removeSchedulePair):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge):
(WebCore::WebCoreNSURLAuthenticationChallengeClient::create): Deleted.
(WebCore::WebCoreNSURLAuthenticationChallengeClient::WebCoreNSURLAuthenticationChallengeClient): Deleted.
(): Deleted.
* platform/network/ProtectionSpaceBase.cpp:
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleInternal.h:
* platform/network/cf/AuthenticationCF.cpp:
(WebCore::AuthenticationChallenge::AuthenticationChallenge):
(WebCore::createCF):
(WebCore::core):
(): Deleted.
* platform/network/cf/AuthenticationCF.h:
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::copyCookiesForURLWithFirstPartyURL):
(WebCore::createCookies):
(WebCore::deleteAllCookiesModifiedSince):
* platform/network/cf/CookieStorageCFNet.cpp:
* platform/network/cf/CredentialStorageCFNet.cpp:
(WebCore::CredentialStorage::getFromPersistentStorage):
* platform/network/cf/ResourceErrorCF.cpp:
(WebCore::ResourceError::setCertificate):
(WebCore::ResourceError::platformLazyInit):
(WebCore::ResourceError::doPlatformIsolatedCopy):
(WebCore::ResourceError::cfError const):
* platform/network/cf/ResourceHandleCFNet.cpp:
* platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest):
(WebCore::installHookToRemoveCFNetworkMessageBlockingMainThread):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace):
* platform/network/cocoa/CredentialCocoa.mm:
(WebCore::Credential::cfCredential const): Deleted.
* platform/network/cocoa/ProtectionSpaceCocoa.mm:
(WebCore::ProtectionSpace::cfSpace const): Deleted.
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::nsURLRequest const):
(WebCore::ResourceRequest::clearOrUpdateNSURLRequest): Deleted.
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::platformCertificateInfo const):
(WebCore::ResourceResponse::ResourceResponse): Deleted.
* platform/network/ios/ResourceHandleIOS.mm: Removed.
* platform/network/mac/AuthenticationMac.mm:
(WebCore::AuthenticationChallenge::authenticationClient const):
(WebCore::mac):
(-[WebCoreAuthenticationClientAsChallengeSender setCFChallenge:]): Deleted.
(-[WebCoreAuthenticationClientAsChallengeSender cfChallenge]): Deleted.
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::synchronousWillSendRequestEnabled):
* platform/network/mac/ResourceRequestMac.mm: Removed.

Source/WebKit:

* NetworkProcess/Downloads/Download.h:

Source/WebKitLegacy:

* WebCoreSupport/WebResourceLoadScheduler.cpp:
(WebResourceLoadScheduler::scheduleLoad):

Source/WebKitLegacy/mac:

* Misc/WebDownload.mm:
(-[WebDownload _initWithLoadingCFURLConnection:request:response:delegate:proxy:]): Deleted.
* Misc/WebDownloadInternal.h:
* Plugins/WebBaseNetscapePluginView.mm:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::convertMainResourceLoadToDownload):
* WebView/WebView.mm:
(-[WebView scheduleInRunLoop:forMode:]):
(-[WebView unscheduleFromRunLoop:forMode:]):

Source/WTF:

* wtf/SchedulePair.h:
* wtf/SchedulePairMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

62 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/SchedulePair.h
Source/WTF/wtf/SchedulePairMac.mm
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/SourcesCocoa.txt
Source/WebCore/SourcesIOS.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/loader/DocumentLoader.h
Source/WebCore/loader/EmptyFrameLoaderClient.h
Source/WebCore/loader/FrameLoaderClient.h
Source/WebCore/loader/ResourceLoader.cpp
Source/WebCore/loader/ResourceLoader.h
Source/WebCore/loader/SubresourceLoader.h
Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp
Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm
Source/WebCore/loader/mac/DocumentLoaderMac.cpp
Source/WebCore/loader/mac/ResourceLoaderMac.mm
Source/WebCore/page/mac/PageMac.mm
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/network/ProtectionSpaceBase.cpp
Source/WebCore/platform/network/ResourceHandle.h
Source/WebCore/platform/network/ResourceHandleInternal.h
Source/WebCore/platform/network/cf/AuthenticationCF.cpp
Source/WebCore/platform/network/cf/AuthenticationCF.h
Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
Source/WebCore/platform/network/cocoa/CredentialCocoa.mm
Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm
Source/WebCore/platform/network/ios/ResourceHandleIOS.mm [deleted file]
Source/WebCore/platform/network/ios/ResourceRequestIOS.mm [deleted file]
Source/WebCore/platform/network/mac/AuthenticationMac.mm
Source/WebCore/platform/network/mac/CookieJarMac.mm
Source/WebCore/platform/network/mac/CredentialStorageMac.mm
Source/WebCore/platform/network/mac/FormDataStreamMac.h
Source/WebCore/platform/network/mac/FormDataStreamMac.mm
Source/WebCore/platform/network/mac/ResourceErrorMac.mm
Source/WebCore/platform/network/mac/ResourceHandleMac.mm
Source/WebCore/platform/network/mac/ResourceRequestMac.mm [deleted file]
Source/WebCore/platform/network/mac/SynchronousLoaderClient.mm
Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h
Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
Source/WebCore/platform/network/mac/WebCoreURLResponse.mm
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/Downloads/Download.h
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Misc/WebDownload.mm
Source/WebKitLegacy/mac/Misc/WebDownloadInternal.h
Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm
Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKitLegacy/mac/WebView/WebPreferences.mm
Source/WebKitLegacy/mac/WebView/WebView.mm

index f5df72e..7617dbb 100644 (file)
@@ -1,3 +1,13 @@
+2017-11-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove Cocoa CFURLConnection loading code
+        https://bugs.webkit.org/show_bug.cgi?id=179688
+
+        Reviewed by Antti Koivisto.
+
+        * wtf/SchedulePair.h:
+        * wtf/SchedulePairMac.mm:
+
 2017-11-13  Brady Eidson  <beidson@apple.com>
 
         Massive "Server-process-to-context-process" connection overhaul.
index 8e701f7..58e180b 100644 (file)
@@ -34,7 +34,7 @@
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
 OBJC_CLASS NSRunLoop;
 #endif
 
@@ -44,7 +44,7 @@ class SchedulePair : public ThreadSafeRefCounted<SchedulePair> {
 public:
     static Ref<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     static Ref<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
     NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
 #endif
@@ -62,7 +62,7 @@ private:
             m_mode = adoptCF(CFStringCreateCopy(0, mode));
     }
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef);
     RetainPtr<NSRunLoop*> m_nsRunLoop;
 #endif
index 24d5577..f7f48ed 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "SchedulePair.h"
 
-#if !USE(CFURLCONNECTION)
-
 namespace WTF {
 
 SchedulePair::SchedulePair(NSRunLoop* runLoop, CFStringRef mode)
@@ -42,5 +40,3 @@ SchedulePair::SchedulePair(NSRunLoop* runLoop, CFStringRef mode)
 }
 
 } // namespace
-
-#endif
index 39b3871..e9ee712 100644 (file)
@@ -1,3 +1,85 @@
+2017-11-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove Cocoa CFURLConnection loading code
+        https://bugs.webkit.org/show_bug.cgi?id=179688
+
+        Reviewed by Antti Koivisto.
+
+        CFURLConnection is only used on the AppleWin port now.
+
+        * PlatformMac.cmake:
+        * SourcesCocoa.txt:
+        * SourcesIOS.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/DocumentLoader.h:
+        * loader/EmptyFrameLoaderClient.h:
+        * loader/FrameLoaderClient.h:
+        * loader/ResourceLoader.cpp:
+        * loader/ResourceLoader.h:
+        * loader/SubresourceLoader.h:
+        * loader/cf/ResourceLoaderCFNet.cpp:
+        * loader/cocoa/SubresourceLoaderCocoa.mm:
+        * loader/mac/DocumentLoaderMac.cpp:
+        * loader/mac/ResourceLoaderMac.mm:
+        * page/mac/PageMac.mm:
+        (WebCore::Page::platformInitialize):
+        (WebCore::Page::addSchedulePair):
+        (WebCore::Page::removeSchedulePair):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge):
+        (WebCore::WebCoreNSURLAuthenticationChallengeClient::create): Deleted.
+        (WebCore::WebCoreNSURLAuthenticationChallengeClient::WebCoreNSURLAuthenticationChallengeClient): Deleted.
+        (): Deleted.
+        * platform/network/ProtectionSpaceBase.cpp:
+        * platform/network/ResourceHandle.h:
+        * platform/network/ResourceHandleInternal.h:
+        * platform/network/cf/AuthenticationCF.cpp:
+        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
+        (WebCore::createCF):
+        (WebCore::core):
+        (): Deleted.
+        * platform/network/cf/AuthenticationCF.h:
+        * platform/network/cf/CookieJarCFNet.cpp:
+        (WebCore::copyCookiesForURLWithFirstPartyURL):
+        (WebCore::createCookies):
+        (WebCore::deleteAllCookiesModifiedSince):
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        * platform/network/cf/CredentialStorageCFNet.cpp:
+        (WebCore::CredentialStorage::getFromPersistentStorage):
+        * platform/network/cf/ResourceErrorCF.cpp:
+        (WebCore::ResourceError::setCertificate):
+        (WebCore::ResourceError::platformLazyInit):
+        (WebCore::ResourceError::doPlatformIsolatedCopy):
+        (WebCore::ResourceError::cfError const):
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest):
+        (WebCore::installHookToRemoveCFNetworkMessageBlockingMainThread):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace):
+        * platform/network/cocoa/CredentialCocoa.mm:
+        (WebCore::Credential::cfCredential const): Deleted.
+        * platform/network/cocoa/ProtectionSpaceCocoa.mm:
+        (WebCore::ProtectionSpace::cfSpace const): Deleted.
+        * platform/network/cocoa/ResourceRequestCocoa.mm:
+        (WebCore::ResourceRequest::nsURLRequest const):
+        (WebCore::ResourceRequest::clearOrUpdateNSURLRequest): Deleted.
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+        (WebCore::ResourceResponse::platformCertificateInfo const):
+        (WebCore::ResourceResponse::ResourceResponse): Deleted.
+        * platform/network/ios/ResourceHandleIOS.mm: Removed.
+        * platform/network/mac/AuthenticationMac.mm:
+        (WebCore::AuthenticationChallenge::authenticationClient const):
+        (WebCore::mac):
+        (-[WebCoreAuthenticationClientAsChallengeSender setCFChallenge:]): Deleted.
+        (-[WebCoreAuthenticationClientAsChallengeSender cfChallenge]): Deleted.
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::synchronousWillSendRequestEnabled):
+        * platform/network/mac/ResourceRequestMac.mm: Removed.
+
 2017-11-14  Daniel Bates  <dabates@apple.com>
 
         Update comment in FeatureDefines.xcconfig to reflect location of Visual Studio property files
index b58418a..a5ad173 100644 (file)
@@ -441,21 +441,12 @@ list(APPEND WebCore_SOURCES
 
     platform/mediastream/mac/MockRealtimeVideoSourceMac.mm
 
-    platform/network/cf/AuthenticationCF.cpp
-    platform/network/cf/CookieJarCFNet.cpp
-    platform/network/cf/CookieStorageCFNet.cpp
-    platform/network/cf/CredentialStorageCFNet.cpp
     platform/network/cf/DNSCFNet.cpp
     platform/network/cf/FormDataStreamCFNet.cpp
-    platform/network/cf/LoaderRunLoopCF.cpp
     platform/network/cf/NetworkStorageSessionCFNet.cpp
     platform/network/cf/ProxyServerCFNet.cpp
-    platform/network/cf/ResourceErrorCF.cpp
     platform/network/cf/ResourceRequestCFNet.cpp
-    platform/network/cf/ResourceResponseCFNet.cpp
     platform/network/cf/SocketStreamHandleImplCFNet.cpp
-    platform/network/cf/SynchronousLoaderClientCFNet.cpp
-    platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
 
     platform/network/cocoa/CookieCocoa.mm
     platform/network/cocoa/CookieStorageObserver.mm
index 9ec21ea..584dc6d 100644 (file)
@@ -87,8 +87,6 @@ loader/archive/cf/LegacyWebArchiveMac.mm
 loader/cocoa/DiskCacheMonitorCocoa.mm
 loader/cocoa/SubresourceLoaderCocoa.mm
 
-loader/cf/ResourceLoaderCFNet.cpp
-
 loader/mac/DocumentLoaderMac.cpp
 loader/mac/LoaderNSURLExtras.mm
 loader/mac/ResourceLoaderMac.mm
@@ -315,20 +313,12 @@ platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp
 platform/mock/MediaPlaybackTargetPickerMock.cpp
 platform/mock/MediaPlaybackTargetMock.cpp
 
-platform/network/cf/AuthenticationCF.cpp
-platform/network/cf/CookieJarCFNet.cpp
-platform/network/cf/CookieStorageCFNet.cpp
-platform/network/cf/CredentialStorageCFNet.cpp
 platform/network/cf/DNSCFNet.cpp
 platform/network/cf/FormDataStreamCFNet.cpp
-platform/network/cf/LoaderRunLoopCF.cpp
 platform/network/cf/NetworkStorageSessionCFNet.cpp
 platform/network/cf/ProxyServerCFNet.cpp
-platform/network/cf/ResourceErrorCF.cpp
 platform/network/cf/ResourceRequestCFNet.cpp
-platform/network/cf/ResourceResponseCFNet.cpp
 platform/network/cf/SocketStreamHandleImplCFNet.cpp
-platform/network/cf/SynchronousLoaderClientCFNet.cpp
 
 platform/network/cocoa/CookieCocoa.mm
 platform/network/cocoa/CookieStorageObserver.mm
@@ -378,10 +368,6 @@ platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm
 
 platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
 
-platform/network/cf/ResourceHandleCFNet.cpp
-platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
-
-
 #if ENABLE_APPLE_PAY
 
     Modules/applepay/ApplePayContactField.cpp
index 2f78dac..5d6b362 100644 (file)
@@ -114,12 +114,8 @@ platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm @no-unify
 
 platform/network/ios/NetworkStateNotifierIOS.mm
 platform/network/ios/PreviewConverter.mm
-platform/network/ios/ResourceHandleIOS.mm
-platform/network/ios/ResourceRequestIOS.mm
 platform/network/ios/WebCoreURLResponseIOS.mm
 
-platform/network/mac/ResourceRequestMac.mm
-
 platform/text/ios/LocalizedDateCache.mm
 platform/text/ios/TextEncodingRegistryIOS.mm
 
index ddb8421..2e34283 100644 (file)
                26B999911803B3C900D01121 /* StackAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999901803B3C900D01121 /* StackAllocator.h */; };
                26B999931803B9D900D01121 /* FunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999921803B9D900D01121 /* FunctionCall.h */; };
                26B999971804D54200D01121 /* SelectorCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999951804D54200D01121 /* SelectorCompiler.h */; };
-               26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */; };
                26E944D91AC4B2DD007B85B5 /* CombinedURLFilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E944D51AC4B2DD007B85B5 /* CombinedURLFilters.h */; settings = {ATTRIBUTES = (Private, ); }; };
                26E944DD1AC4B4EA007B85B5 /* Term.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E944DC1AC4B4EA007B85B5 /* Term.h */; settings = {ATTRIBUTES = (Private, ); }; };
                26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E98A0F130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h */; };
                26F756B51B3B68F20005DD79 /* ImmutableNFANodeBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F756B41B3B68F20005DD79 /* ImmutableNFANodeBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
                26F9A83818A046AC00AEB88A /* ViewportConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F9A83618A046AC00AEB88A /* ViewportConfiguration.cpp */; };
                26F9A83918A046AC00AEB88A /* ViewportConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F9A83718A046AC00AEB88A /* ViewportConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               26FAE4CC1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FAE4C81852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp */; };
-               26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */; };
                2914E3081CAB5A440049966F /* AccessibilityAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2914E3061CAB5A440049966F /* AccessibilityAttachment.h */; };
                2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2917B5631473496C0052C9D0 /* LayerFlushSchedulerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B5601473496C0052C9D0 /* LayerFlushSchedulerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */; };
                7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */; };
                7EDAAFC919A2CCDC0034DFD1 /* DiskCacheMonitorCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EDAAFC819A2CBD10034DFD1 /* DiskCacheMonitorCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */; };
-               7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */; };
                7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845712D26E3800E79415 /* ResourceError.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845A12D26E3800E79415 /* ResourceRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7EE6846F12D26E3800E79415 /* ResourceRequestCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                26B999921803B9D900D01121 /* FunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionCall.h; sourceTree = "<group>"; };
                26B999941804D54200D01121 /* SelectorCompiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorCompiler.cpp; sourceTree = "<group>"; };
                26B999951804D54200D01121 /* SelectorCompiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorCompiler.h; sourceTree = "<group>"; };
-               26C15CF41857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp; sourceTree = "<group>"; };
-               26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleCFURLConnectionDelegateWithOperationQueue.h; sourceTree = "<group>"; };
                26D4E8451B42539D00E033A2 /* DFANode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFANode.cpp; sourceTree = "<group>"; };
                26E944D41AC4B2DD007B85B5 /* CombinedURLFilters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CombinedURLFilters.cpp; sourceTree = "<group>"; };
                26E944D51AC4B2DD007B85B5 /* CombinedURLFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CombinedURLFilters.h; sourceTree = "<group>"; };
                26F756B41B3B68F20005DD79 /* ImmutableNFANodeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImmutableNFANodeBuilder.h; sourceTree = "<group>"; };
                26F9A83618A046AC00AEB88A /* ViewportConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportConfiguration.cpp; sourceTree = "<group>"; };
                26F9A83718A046AC00AEB88A /* ViewportConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportConfiguration.h; sourceTree = "<group>"; };
-               26FAE4C81852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFURLConnectionDelegate.cpp; sourceTree = "<group>"; };
-               26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleCFURLConnectionDelegate.h; sourceTree = "<group>"; };
                2914E3051CAB5A440049966F /* AccessibilityAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityAttachment.cpp; sourceTree = "<group>"; };
                2914E3061CAB5A440049966F /* AccessibilityAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityAttachment.h; sourceTree = "<group>"; };
                2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerFlushScheduler.cpp; sourceTree = "<group>"; };
                43F6FD9513BCD0B100224052 /* SVGAnimatedInteger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedInteger.cpp; sourceTree = "<group>"; };
                4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPlugInImageElement.h; sourceTree = "<group>"; };
                4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
-               442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronousLoaderClientCFNet.cpp; sourceTree = "<group>"; };
                443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
                443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
                443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStateNotifierIOS.mm; sourceTree = "<group>"; };
                514C76450CE9234E007EF3CD /* FormDataStreamMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FormDataStreamMac.mm; sourceTree = "<group>"; };
                514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceErrorMac.mm; sourceTree = "<group>"; };
                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleMac.mm; sourceTree = "<group>"; };
-               514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestMac.mm; sourceTree = "<group>"; };
                514C76580CE923A1007EF3CD /* CredentialBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialBase.cpp; sourceTree = "<group>"; };
                514C76590CE923A1007EF3CD /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = "<group>"; };
                514C765A0CE923A1007EF3CD /* FormData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormData.cpp; sourceTree = "<group>"; };
                7CFDC57B1AC1D80500E24A57 /* ContentExtensionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionError.h; sourceTree = "<group>"; };
                7D4C96D81AD4483500365A50 /* JSFetchHeaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchHeaders.cpp; sourceTree = "<group>"; };
                7D4C96D91AD4483500365A50 /* JSFetchHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchHeaders.h; sourceTree = "<group>"; };
-               7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleIOS.mm; sourceTree = "<group>"; };
                7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESElementIndexUint.cpp; sourceTree = "<group>"; };
                7E46F6F91627A2C900062223 /* JSOESElementIndexUint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESElementIndexUint.h; sourceTree = "<group>"; };
                7E474E1B12494DC900235364 /* SQLiteDatabaseTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabaseTrackerClient.h; sourceTree = "<group>"; };
                7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLCompressedTextureATC.h; sourceTree = "<group>"; };
                7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
                7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestCocoa.mm; sourceTree = "<group>"; };
-               7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestIOS.mm; sourceTree = "<group>"; };
                7E8FADC3199A95B100714968 /* SubresourceLoaderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SubresourceLoaderCocoa.mm; sourceTree = "<group>"; };
                7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFocusAllowedIndicator.cpp; sourceTree = "<group>"; };
                7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowFocusAllowedIndicator.h; sourceTree = "<group>"; };
                7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTextureATC.h; sourceTree = "<group>"; };
                7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
                7EDAAFC819A2CBD10034DFD1 /* DiskCacheMonitorCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskCacheMonitorCocoa.h; sourceTree = "<group>"; };
-               7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationCF.cpp; sourceTree = "<group>"; };
-               7EE6844D12D26E3800E79415 /* AuthenticationCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationCF.h; sourceTree = "<group>"; };
                7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallenge.h; sourceTree = "<group>"; };
-               7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieJarCFNet.cpp; sourceTree = "<group>"; };
-               7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieStorageCFNet.cpp; sourceTree = "<group>"; };
-               7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialStorageCFNet.cpp; sourceTree = "<group>"; };
                7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataStreamCFNet.cpp; sourceTree = "<group>"; };
                7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataStreamCFNet.h; sourceTree = "<group>"; };
-               7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderRunLoopCF.cpp; sourceTree = "<group>"; };
-               7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderRunLoopCF.h; sourceTree = "<group>"; };
                7EE6845712D26E3800E79415 /* ResourceError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceError.h; sourceTree = "<group>"; };
-               7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceErrorCF.cpp; sourceTree = "<group>"; };
-               7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFNet.cpp; sourceTree = "<group>"; };
                7EE6845A12D26E3800E79415 /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; };
                7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceRequestCFNet.cpp; sourceTree = "<group>"; };
                7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequestCFNet.h; sourceTree = "<group>"; };
                7EE6845D12D26E3800E79415 /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponse.h; sourceTree = "<group>"; };
-               7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseCFNet.cpp; sourceTree = "<group>"; };
-               7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoaderCFNet.cpp; sourceTree = "<group>"; };
                7F4C96D81AD4483500365A50 /* JSFetchBody.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchBody.cpp; sourceTree = "<group>"; };
                7F4C96D81AD4483500365A51 /* JSReadableStreamSink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamSink.cpp; sourceTree = "<group>"; };
                7F4C96D91AD4483500365A50 /* JSFetchBody.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchBody.h; sourceTree = "<group>"; };
                                A1C150781E3F2B3E0032C98C /* PreviewConverter.h */,
                                A1C150771E3F2B3E0032C98C /* PreviewConverter.mm */,
                                A10DBF4618F92317000D70C6 /* PreviewLoaderClient.h */,
-                               7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */,
-                               7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */,
                                44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */,
                                444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */,
                        );
                                1A7FA6470DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp */,
                                514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */,
                                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */,
-                               514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */,
                                E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */,
                                1FAFBF1615A5FA5200083A20 /* UTIUtilities.h */,
                                1FAFBF1715A5FA5200083A20 /* UTIUtilities.mm */,
                        path = cocoa;
                        sourceTree = "<group>";
                };
-               7EE6847312D26E5500E79415 /* cf */ = {
-                       isa = PBXGroup;
-                       children = (
-                               7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,
-                       );
-                       path = cf;
-                       sourceTree = "<group>";
-               };
                832150791F27E96B0095B136 /* beacon */ = {
                        isa = PBXGroup;
                        children = (
                B2F34FE70E82F81700F627CD /* cf */ = {
                        isa = PBXGroup;
                        children = (
-                               7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */,
-                               7EE6844D12D26E3800E79415 /* AuthenticationCF.h */,
                                7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */,
                                5F2DBBE8178E336900141486 /* CertificateInfo.h */,
-                               7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */,
-                               7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */,
-                               7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */,
                                B2F34FE80E82F82700F627CD /* DNSCFNet.cpp */,
                                7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */,
                                7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */,
-                               7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */,
-                               7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */,
                                E13EF34716850C470034C83F /* NetworkStorageSessionCFNet.cpp */,
                                1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */,
                                7EE6845712D26E3800E79415 /* ResourceError.h */,
-                               7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */,
-                               7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */,
-                               26FAE4C81852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp */,
-                               26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */,
-                               26C15CF41857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp */,
-                               26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */,
                                7EE6845A12D26E3800E79415 /* ResourceRequest.h */,
                                7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */,
                                7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */,
                                7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
-                               7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
                                51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */,
                                51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */,
-                               442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */,
                        );
                        path = cf;
                        sourceTree = "<group>";
                                1A8F6BB00DB55CDC001DB794 /* appcache */,
                                512DD8E80D91E691000F89EE /* archive */,
                                A8D2B2521287A56000AF4DDA /* cache */,
-                               7EE6847312D26E5500E79415 /* cf */,
                                7E4DE10B198B10810051CB02 /* cocoa */,
                                5126E6B60A2E3AEF005C29FA /* icon */,
                                A15E31F01E0CB075004B371C /* ios */,
                                07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */,
                                07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */,
                                FD31608B12B026F700C1A359 /* AudioUtilities.h in Headers */,
-                               7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
                                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
                                934F713A0D5A6F1000018D69 /* AuthenticationChallengeBase.h in Headers */,
                                E124748410AA161D00B79493 /* AuthenticationClient.h in Headers */,
                                E3B2F0EE1D7F4CA900B0C9D1 /* LoadableScriptClient.h in Headers */,
                                9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */,
                                656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
-                               7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
                                51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */,
                                8A12E35D11FA33280025836A /* LoadTiming.h in Headers */,
                                06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
                                7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */,
                                934F713C0D5A6F1900018D69 /* ResourceErrorBase.h in Headers */,
                                514C76790CE923A1007EF3CD /* ResourceHandle.h in Headers */,
-                               26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */,
-                               26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */,
                                514C767A0CE923A1007EF3CD /* ResourceHandleClient.h in Headers */,
                                514C767B0CE923A1007EF3CD /* ResourceHandleInternal.h in Headers */,
                                656D373F0ADBA5DE00A4554D /* ResourceLoader.h in Headers */,
                                AA12DF491743DF83004DAFDF /* PlatformSpeechSynthesizerIOS.mm in Sources */,
                                CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
                                CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
-                               26FAE4CC1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp in Sources */,
                                316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
                                BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */,
                                BCEF869F0E844E9D00A85CD5 /* ScrollbarThemeMac.mm in Sources */,
index d8a245d..0a5f015 100644 (file)
@@ -53,7 +53,7 @@
 #include <wtf/RunLoopTimer.h>
 #endif
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
 #include <wtf/SchedulePair.h>
 #endif
 
@@ -156,7 +156,7 @@ public:
     WEBCORE_EXPORT void setTitle(const StringWithDirection&);
     const String& overrideEncoding() const { return m_overrideEncoding; }
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     void schedule(SchedulePair&);
     void unschedule(SchedulePair&);
 #endif
index 06ee247..3268094 100644 (file)
@@ -188,7 +188,7 @@ class WEBCORE_EXPORT EmptyFrameLoaderClient : public FrameLoaderClient {
     NSCachedURLResponse *willCacheResponse(DocumentLoader*, unsigned long, NSCachedURLResponse *response) const final { return response; }
 #endif
 
-#if PLATFORM(WIN) && USE(CFURLCONNECTION)
+#if USE(CFURLCONNECTION)
     bool shouldCacheResponse(DocumentLoader*, unsigned long, const ResourceResponse&, const unsigned char*, unsigned long long) final { return true; }
 #endif
 
index 1af23ec..02f9b42 100644 (file)
@@ -300,7 +300,7 @@ public:
     virtual NSDictionary *dataDetectionContext() { return nullptr; }
 #endif
 
-#if PLATFORM(WIN) && USE(CFURLCONNECTION)
+#if USE(CFURLCONNECTION)
     // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
     virtual bool shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length) = 0;
 #endif
index 844bc87..122142f 100644 (file)
@@ -762,7 +762,7 @@ void ResourceLoader::receivedCancellation(const AuthenticationChallenge&)
     cancel();
 }
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
 
 void ResourceLoader::schedule(SchedulePair& pair)
 {
index 099d4e5..497d7ae 100644 (file)
@@ -137,7 +137,7 @@ public:
 
     const LoadTiming& loadTiming() { return m_loadTiming; }
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     void schedule(WTF::SchedulePair&);
     void unschedule(WTF::SchedulePair&);
 #endif
@@ -157,12 +157,9 @@ protected:
 
     void didReceiveDataOrBuffer(const char*, unsigned, RefPtr<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     NSCachedURLResponse* willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override;
 #endif
-#if PLATFORM(COCOA) && USE(CFURLCONNECTION)
-    CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
-#endif
 
     virtual void willSendRequestInternal(ResourceRequest&&, const ResourceResponse& redirectResponse, CompletionHandler<void(ResourceRequest&&)>&&);
 
@@ -202,7 +199,7 @@ private:
 #if PLATFORM(IOS)
     RetainPtr<CFDictionaryRef> connectionProperties(ResourceHandle*) override;
 #endif
-#if PLATFORM(WIN) && USE(CFURLCONNECTION)
+#if USE(CFURLCONNECTION)
     // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
     bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
 #endif
index 79bb3d5..bb59114 100644 (file)
@@ -76,12 +76,9 @@ private:
     void didCancel(const ResourceError&) override;
     void didRetrieveDerivedDataFromCache(const String& type, SharedBuffer&) override;
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override;
 #endif
-#if PLATFORM(COCOA) && USE(CFURLCONNECTION)
-    CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
-#endif
 
     void releaseResources() override;
 
index ddc26a3..4ae0bcb 100644 (file)
 #include "config.h"
 #include "ResourceLoader.h"
 
-#if USE(CFURLCONNECTION)
-
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 
 namespace WebCore {
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(CFURLCONNECTION)
 
 bool ResourceLoader::shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef cachedResponse)
 {
@@ -48,5 +46,3 @@ bool ResourceLoader::shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef
 #endif
 
 } // namespace WebCore
-
-#endif // USE(CFURLCONNECTION)
index a2fc944..f60360b 100644 (file)
 
 namespace WebCore {
 
-#if USE(CFURLCONNECTION)
-
-CFCachedURLResponseRef SubresourceLoader::willCacheResponse(ResourceHandle* handle, CFCachedURLResponseRef cachedResponse)
-{
-    DiskCacheMonitor::monitorFileBackingStoreCreation(request(), m_resource->sessionID(), cachedResponse);
-    if (!m_resource->shouldCacheResponse(CFCachedURLResponseGetWrappedResponse(cachedResponse)))
-        return nullptr;
-    return ResourceLoader::willCacheResponse(handle, cachedResponse);
-}
-
-#else
-
 NSCachedURLResponse* SubresourceLoader::willCacheResponse(ResourceHandle* handle, NSCachedURLResponse* response)
 {
     DiskCacheMonitor::monitorFileBackingStoreCreation(request(), m_resource->sessionID(), [response _CFCachedURLResponse]);
@@ -55,6 +43,4 @@ NSCachedURLResponse* SubresourceLoader::willCacheResponse(ResourceHandle* handle
     return ResourceLoader::willCacheResponse(handle, response);
 }
 
-#endif
-
 }
index ecda2e0..4f72f2c 100644 (file)
@@ -33,8 +33,6 @@
 
 namespace WebCore {
 
-#if !USE(CFURLCONNECTION)
-
 static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
 {
     for (auto& loader : copyToVector(loaders.values()))
@@ -65,6 +63,4 @@ void DocumentLoader::unschedule(SchedulePair& pair)
     unscheduleAll(m_multipartSubresourceLoaders, pair);
 }
 
-#endif
-
 } // namespace WebCore
index 8904741..018ec4e 100644 (file)
 
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
-#include "SharedBuffer.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
-#if USE(CFURLCONNECTION)
-
-CFCachedURLResponseRef ResourceLoader::willCacheResponse(ResourceHandle*, CFCachedURLResponseRef cachedResponse)
-{
-    if (m_options.sendLoadCallbacks == DoNotSendCallbacks)
-        return nullptr;
-
-    RetainPtr<NSCachedURLResponse> nsCachedResponse = adoptNS([[NSCachedURLResponse alloc] _initWithCFCachedURLResponse:cachedResponse]);
-    return [frameLoader()->client().willCacheResponse(documentLoader(), identifier(), nsCachedResponse.get()) _CFCachedURLResponse];
-}
-
-#else
-
 NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCachedURLResponse* response)
 {
     if (m_options.sendLoadCallbacks == DoNotSendCallbacks)
@@ -56,6 +41,4 @@ NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCached
     return frameLoader()->client().willCacheResponse(documentLoader(), identifier(), response);
 }
 
-#endif
-
 }
index 6ac5217..4807e7b 100644 (file)
@@ -46,17 +46,9 @@ namespace WebCore {
 void Page::platformInitialize()
 {
 #if PLATFORM(IOS)
-#if USE(CFURLCONNECTION)
-    addSchedulePair(SchedulePair::create(WebThreadRunLoop(), kCFRunLoopCommonModes));
-#else
     addSchedulePair(SchedulePair::create(WebThreadNSRunLoop(), kCFRunLoopCommonModes));
-#endif // USE(CFURLCONNECTION)
 #else
-#if USE(CFURLCONNECTION)
     addSchedulePair(SchedulePair::create([[NSRunLoop currentRunLoop] getCFRunLoop], kCFRunLoopCommonModes));
-#else
-    addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));
-#endif
 #endif
 
 #if ENABLE(TREE_DEBUGGING)
@@ -74,14 +66,12 @@ void Page::addSchedulePair(Ref<SchedulePair>&& pair)
         m_scheduledRunLoopPairs = std::make_unique<SchedulePairHashSet>();
     m_scheduledRunLoopPairs->add(pair.ptr());
 
-#if !USE(CFURLCONNECTION)
     for (Frame* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
         if (DocumentLoader* documentLoader = frame->loader().documentLoader())
             documentLoader->schedule(pair);
         if (DocumentLoader* documentLoader = frame->loader().provisionalDocumentLoader())
             documentLoader->schedule(pair);
     }
-#endif
 
     // FIXME: make SharedTimerMac use these SchedulePairs.
 }
@@ -94,14 +84,12 @@ void Page::removeSchedulePair(Ref<SchedulePair>&& pair)
 
     m_scheduledRunLoopPairs->remove(pair.ptr());
 
-#if !USE(CFURLCONNECTION)
     for (Frame* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
         if (DocumentLoader* documentLoader = frame->loader().documentLoader())
             documentLoader->unschedule(pair);
         if (DocumentLoader* documentLoader = frame->loader().provisionalDocumentLoader())
             documentLoader->unschedule(pair);
     }
-#endif
 }
 
 } // namespace
index bc2d7c1..ae23d8b 100644 (file)
 #import <VideoToolbox/VideoToolbox.h>
 #endif
 
-#if USE(CFURLCONNECTION)
-#include <pal/spi/cocoa/CFNSURLConnectionSPI.h>
-#endif
-
 #import "CoreVideoSoftLink.h"
 #import "MediaRemoteSoftLink.h"
 
@@ -392,58 +388,6 @@ static dispatch_queue_t globalPullDelegateQueue()
 }
 #endif
 
-#if USE(CFURLCONNECTION)
-class WebCoreNSURLAuthenticationChallengeClient : public RefCounted<WebCoreNSURLAuthenticationChallengeClient>, public AuthenticationClient {
-public:
-    static RefPtr<WebCoreNSURLAuthenticationChallengeClient> create(NSURLAuthenticationChallenge *challenge)
-    {
-        return adoptRef(new WebCoreNSURLAuthenticationChallengeClient(challenge));
-    }
-
-    using RefCounted<WebCoreNSURLAuthenticationChallengeClient>::ref;
-    using RefCounted<WebCoreNSURLAuthenticationChallengeClient>::deref;
-
-private:
-    WebCoreNSURLAuthenticationChallengeClient(NSURLAuthenticationChallenge *challenge)
-        : m_challenge(challenge)
-    {
-        ASSERT(m_challenge);
-    }
-
-    void refAuthenticationClient() override { ref(); }
-    void derefAuthenticationClient() override { deref(); }
-
-    void receivedCredential(const AuthenticationChallenge&, const Credential& credential) override
-    {
-        [[m_challenge sender] useCredential:credential.nsCredential() forAuthenticationChallenge:m_challenge.get()];
-    }
-
-    void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&) override
-    {
-        [[m_challenge sender] continueWithoutCredentialForAuthenticationChallenge:m_challenge.get()];
-    }
-
-    void receivedCancellation(const AuthenticationChallenge&) override
-    {
-        [[m_challenge sender] cancelAuthenticationChallenge:m_challenge.get()];
-    }
-
-    void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&) override
-    {
-        if ([[m_challenge sender] respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)])
-            [[m_challenge sender] performDefaultHandlingForAuthenticationChallenge:m_challenge.get()];
-    }
-
-    void receivedChallengeRejection(const AuthenticationChallenge&) override
-    {
-        if ([[m_challenge sender] respondsToSelector:@selector(rejectProtectionSpaceAndContinueWithChallenge:)])
-            [[m_challenge sender] rejectProtectionSpaceAndContinueWithChallenge:m_challenge.get()];
-    }
-
-    RetainPtr<NSURLAuthenticationChallenge> m_challenge;
-};
-#endif
-
 void MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(MediaEngineRegistrar registrar)
 {
     if (!isAvailable())
@@ -1869,16 +1813,8 @@ bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource(AVAssetR
     return true;
 }
 
-bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge* nsChallenge)
+bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge* challenge)
 {
-#if USE(CFURLCONNECTION)
-    RefPtr<WebCoreNSURLAuthenticationChallengeClient> client = WebCoreNSURLAuthenticationChallengeClient::create(nsChallenge);
-    RetainPtr<CFURLAuthChallengeRef> cfChallenge = adoptCF([nsChallenge _createCFAuthChallenge]);
-    AuthenticationChallenge challenge(cfChallenge.get(), client.get());
-#else
-    AuthenticationChallenge challenge(nsChallenge);
-#endif
-
     return player()->shouldWaitForResponseToAuthenticationChallenge(challenge);
 }
 
index dfc74e5..fca64c8 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "ProtectionSpace.h"
 
-#if USE(CFURLCONNECTION) && !PLATFORM(COCOA)
+#if USE(CFURLCONNECTION)
 #include "AuthenticationCF.h"
 #include <CFNetwork/CFURLProtectionSpacePriv.h>
 #endif
@@ -118,7 +118,6 @@ bool ProtectionSpaceBase::isPasswordBased() const
     return true;
 }
 
-
 bool ProtectionSpaceBase::compare(const ProtectionSpace& a, const ProtectionSpace& b)
 {
     if (a.host() != b.host())
index e2dcb3d..f2e1068 100644 (file)
@@ -125,7 +125,7 @@ public:
     bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
 #endif
 
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     WEBCORE_EXPORT NSURLConnection *connection() const;
     id makeDelegate(bool, WTF::MessageQueue<WTF::Function<void()>>*);
     id delegate();
@@ -205,7 +205,7 @@ public:
 #if USE(CFURLCONNECTION)
     WEBCORE_EXPORT void continueWillCacheResponse(CFCachedURLResponseRef);
 #endif
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     WEBCORE_EXPORT void continueWillCacheResponse(NSCachedURLResponse *);
 #endif
 
@@ -225,10 +225,6 @@ public:
     WEBCORE_EXPORT static CFStringRef synchronousLoadRunLoopMode();
 #endif
 
-#if PLATFORM(IOS) && USE(CFURLCONNECTION)
-    static CFMutableDictionaryRef createSSLPropertiesFromNSURLRequest(const ResourceRequest&);
-#endif
-
     typedef Ref<ResourceHandle> (*BuiltinConstructor)(const ResourceRequest& request, ResourceHandleClient* client);
     static void registerBuiltinConstructor(const AtomicString& protocol, BuiltinConstructor);
 
@@ -269,11 +265,11 @@ private:
     void createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, WTF::MessageQueue<WTF::Function<void()>>*, CFDictionaryRef clientProperties);
 #endif
 
-#if PLATFORM(MAC) && !USE(CFURLCONNECTION)
+#if PLATFORM(MAC)
     void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, SchedulingBehavior);
 #endif
 
-#if PLATFORM(IOS) && !USE(CFURLCONNECTION)
+#if PLATFORM(IOS)
     void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, SchedulingBehavior, NSDictionary *connectionProperties);
 #endif
 
index c9b3745..518cf9c 100644 (file)
@@ -121,7 +121,7 @@ public:
     ResourceRequest m_currentRequest;
     RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
 #endif
-#if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     RetainPtr<NSURLConnection> m_connection;
     RetainPtr<id> m_delegate;
 #endif
index 391e40b..a37850d 100644 (file)
@@ -44,11 +44,7 @@ AuthenticationChallenge::AuthenticationChallenge(const ProtectionSpace& protecti
 }
 
 AuthenticationChallenge::AuthenticationChallenge(CFURLAuthChallengeRef cfChallenge, AuthenticationClient* authenticationClient)
-#if PLATFORM(COCOA)
-    : AuthenticationChallengeBase(ProtectionSpace(CFURLAuthChallengeGetProtectionSpace(cfChallenge)), Credential(CFURLAuthChallengeGetProposedCredential(cfChallenge)),
-#else
     : AuthenticationChallengeBase(core(CFURLAuthChallengeGetProtectionSpace(cfChallenge)), core(CFURLAuthChallengeGetProposedCredential(cfChallenge)),
-#endif
         CFURLAuthChallengeGetPreviousFailureCount(cfChallenge), (CFURLResponseRef)CFURLAuthChallengeGetFailureResponse(cfChallenge), CFURLAuthChallengeGetError(cfChallenge))
     , m_authenticationClient(authenticationClient)
     , m_cfChallenge(cfChallenge)
@@ -80,20 +76,12 @@ CFURLAuthChallengeRef createCF(const AuthenticationChallenge& coreChallenge)
 {
     // FIXME: Why not cache CFURLAuthChallengeRef in m_cfChallenge? Foundation counterpart does that.
 
-#if PLATFORM(COCOA)
-    CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, coreChallenge.protectionSpace().cfSpace(), coreChallenge.proposedCredential().cfCredential(),
-#else
     RetainPtr<CFURLCredentialRef> credential = adoptCF(createCF(coreChallenge.proposedCredential()));
     RetainPtr<CFURLProtectionSpaceRef> protectionSpace = adoptCF(createCF(coreChallenge.protectionSpace()));
-    CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, protectionSpace.get(), credential.get(),
-#endif
-                                        coreChallenge.previousFailureCount(),
-                                        coreChallenge.failureResponse().cfURLResponse(),
-                                        coreChallenge.error());
+    CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, protectionSpace.get(), credential.get(), coreChallenge.previousFailureCount(), coreChallenge.failureResponse().cfURLResponse(), coreChallenge.error());
     return result;
 }
 
-#if !PLATFORM(COCOA)
 CFURLCredentialRef createCF(const Credential& coreCredential)
 {
     CFURLCredentialPersistence persistence = kCFURLCredentialPersistenceNone;
@@ -275,7 +263,6 @@ ProtectionSpace core(CFURLProtectionSpaceRef cfSpace)
                            CFURLProtectionSpaceGetRealm(cfSpace),
                            scheme);
 }
-#endif
 
 }
 
index 9f0b929..89a9352 100644 (file)
@@ -39,18 +39,10 @@ class Credential;
 class ProtectionSpace;
 
 CFURLAuthChallengeRef createCF(const AuthenticationChallenge&);
-#if PLATFORM(WIN)
 CFURLCredentialRef createCF(const Credential&);
 CFURLProtectionSpaceRef createCF(const ProtectionSpace&);
-#endif
-
-#if PLATFORM(COCOA)
-AuthenticationChallenge core(CFURLAuthChallengeRef);
-#endif
-#if PLATFORM(WIN)
 Credential core(CFURLCredentialRef);
 ProtectionSpace core(CFURLProtectionSpaceRef);
-#endif
 }
 
 #endif // USE(CFURLCONNECTION)
index 49a9248..919b366 100644 (file)
 #include "URL.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <CoreFoundation/CoreFoundation.h>
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <pal/spi/cf/CFNetworkSPI.h>
+#include <windows.h>
 #include <wtf/SoftLinking.h>
 #include <wtf/cf/TypeCastsCF.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#include <windows.h>
-#endif
-
-#if PLATFORM(WIN)
 enum {
     CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
 };
-#endif
 
 namespace WTF {
 
@@ -130,22 +125,13 @@ static RetainPtr<CFArrayRef> copyCookiesForURLWithFirstPartyURL(const NetworkSto
 
     ASSERT(!secure || (secure && url.protocolIs("https")));
 
-#if PLATFORM(COCOA)
-    return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
-#else
-    // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
     UNUSED_PARAM(firstParty);
     return adoptCF(CFHTTPCookieStorageCopyCookiesForURL(session.cookieStorage().get(), url.createCFURL().get(), secure));
-#endif
 }
 
 static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
 {
-#if PLATFORM(IOS)
-    CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#else
     CFArrayRef parsedCookies = CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#endif
     if (!parsedCookies)
         parsedCookies = CFArrayCreate(kCFAllocatorDefault, 0, 0, &kCFTypeArrayCallBacks);
 
@@ -288,7 +274,6 @@ void deleteAllCookies(const NetworkStorageSession& session)
     CFHTTPCookieStorageDeleteAllCookies(session.cookieStorage().get());
 }
 
-#if PLATFORM(WIN)
 void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
 {
 }
@@ -296,7 +281,6 @@ void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vecto
 void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point)
 {
 }
-#endif
 
 } // namespace WebCore
 
index 5cfe903..43032dc 100644 (file)
 #include "config.h"
 #include "CookieStorage.h"
 
+#include "LoaderRunLoopCF.h"
 #include "NetworkStorageSession.h"
+#include <CFNetwork/CFHTTPCookiesPriv.h>
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <wtf/Function.h>
 #include <wtf/HashMap.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 
-#if PLATFORM(WIN)
-#include "LoaderRunLoopCF.h"
-#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
 namespace WebCore {
 
-#if PLATFORM(WIN)
-
 static HashMap<CFHTTPCookieStorageRef, WTF::Function<void ()>>& cookieChangeCallbackMap()
 {
     static NeverDestroyed<HashMap<CFHTTPCookieStorageRef, WTF::Function<void ()>>> map;
@@ -101,6 +96,4 @@ void stopObservingCookieChanges(const NetworkStorageSession& storageSession)
     CFHTTPCookieStorageUnscheduleFromRunLoop(cookieStorage.get(), runLoop, kCFRunLoopCommonModes);
 }
 
-#endif // PLATFORM(WIN)
-
 } // namespace WebCore
index d57f20d..78ff203 100644 (file)
 #include "AuthenticationCF.h"
 #include "Credential.h"
 #include "ProtectionSpace.h"
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(WIN)
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
-#if PLATFORM(IOS)
-#include <CFNetwork/CFURLCredentialStorage.h>
-#endif
-
 namespace WebCore {
     
 static inline CFURLCredentialRef copyCredentialFromProtectionSpace(CFURLProtectionSpaceRef protectionSpace)
@@ -52,14 +45,9 @@ static inline CFURLCredentialRef copyCredentialFromProtectionSpace(CFURLProtecti
 
 Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
 {
-#if PLATFORM(COCOA)
-    auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpace.cfSpace()));
-    return Credential(credentialCF.get());
-#else
     auto protectionSpaceCF = adoptCF(createCF(protectionSpace));
     auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpaceCF.get()));
     return core(credentialCF.get());
-#endif
 }
 
 } // namespace WebCore
index 7cbfd06..ba3605b 100644 (file)
 #include "URL.h"
 #include <CoreFoundation/CFError.h>
 #include <CFNetwork/CFNetworkErrors.h>
-#include <wtf/RetainPtr.h>
-
-#if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
+#include <wtf/RetainPtr.h>
 
 namespace WebCore {
 
@@ -48,7 +45,6 @@ ResourceError::ResourceError(CFErrorRef cfError)
         setType((CFErrorGetCode(m_platformError.get()) == kCFURLErrorTimedOut) ? Type::Timeout : Type::General);
 }
 
-#if PLATFORM(WIN)
 ResourceError::ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate)
     : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription, Type::General)
     , m_dataIsUpToDate(true)
@@ -68,7 +64,6 @@ void ResourceError::setCertificate(CFDataRef certificate)
 {
     m_certificate = certificate;
 }
-#endif // PLATFORM(WIN)
 
 const CFStringRef failingURLStringKey = CFSTR("NSErrorFailingURLStringKey");
 const CFStringRef failingURLKey = CFSTR("NSErrorFailingURLKey");
@@ -111,9 +106,7 @@ void ResourceError::platformLazyInit()
         }
         m_localizedDescription = (CFStringRef) CFDictionaryGetValue(userInfo.get(), kCFErrorLocalizedDescriptionKey);
         
-#if PLATFORM(WIN)
         m_certificate = wkGetSSLPeerCertificateData(userInfo.get());
-#endif
     }
 
     m_dataIsUpToDate = true;
@@ -122,11 +115,7 @@ void ResourceError::platformLazyInit()
 
 void ResourceError::doPlatformIsolatedCopy(const ResourceError& other)
 {
-#if PLATFORM(WIN)
     m_certificate = other.m_certificate;
-#else
-    UNUSED_PARAM(other);
-#endif
 }
 
 bool ResourceError::platformCompare(const ResourceError& a, const ResourceError& b)
@@ -154,10 +143,8 @@ CFErrorRef ResourceError::cfError() const
                 CFDictionarySetValue(userInfo.get(), failingURLKey, url.get());
         }
 
-#if PLATFORM(WIN)
         if (m_certificate)
             wkSetSSLPeerCertificateData(userInfo.get(), m_certificate.get());
-#endif
         
         m_platformError = adoptCF(CFErrorCreate(0, m_domain.createCFString().get(), m_errorCode, userInfo.get()));
     }
index 59f327b..50ee3ef 100644 (file)
 #include <wtf/text/Base64.h>
 #include <wtf/text/CString.h>
 
-#if PLATFORM(COCOA)
-#include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
-#if USE(CFURLCONNECTION)
-#include "WebCoreURLResponse.h"
-#include <CFNetwork/CFURLConnectionPriv.h>
-#include <CFNetwork/CFURLRequestPriv.h>
-#endif
-#endif
-
 #if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <process.h>
index 7c76609..a7b9c81 100644 (file)
 #include "FormDataStreamCFNet.h"
 #include "NetworkingContext.h"
 #include "ResourceHandle.h"
-#include <pal/spi/cf/CFNetworkSPI.h>
-
-#if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index dae0239..a216089 100644 (file)
@@ -73,16 +73,12 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::releaseHandle()
 
 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef request)
 {
-#if PLATFORM(IOS)
-    CFURLRequestSetShouldStartSynchronously(request, 1);
-#endif
     CFURLRef requestURL = CFURLRequestGetURL(request);
     if (!requestURL)
         return;
     m_originalScheme = adoptCF(CFURLCopyScheme(requestURL));
 }
 
-#if PLATFORM(WIN)
 LRESULT CALLBACK hookToRemoveCFNetworkMessage(int code, WPARAM wParam, LPARAM lParam)
 {
     MSG* msg = reinterpret_cast<MSG*>(lParam);
@@ -100,7 +96,6 @@ static void installHookToRemoveCFNetworkMessageBlockingMainThread()
         hook = ::SetWindowsHookExW(WH_GETMESSAGE, hookToRemoveCFNetworkMessage, 0, threadID);
     }
 }
-#endif
 
 static void emptyPerform(void*)
 {
@@ -132,9 +127,7 @@ static CFRunLoopRef getRunLoop()
 
 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling(CFURLConnectionRef connection)
 {
-#if PLATFORM(WIN)
     installHookToRemoveCFNetworkMessageBlockingMainThread();
-#endif
     CFRunLoopRef runLoop = getRunLoop();
     CFURLConnectionScheduleWithRunLoop(connection, runLoop, kCFRunLoopDefaultMode);
     CFURLConnectionScheduleDownloadWithRunLoop(connection, runLoop, kCFRunLoopDefaultMode);
@@ -201,22 +194,13 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse
 
         if (statusCode != 304) {
             bool isMainResourceLoad = handle->firstRequest().requester() == ResourceRequest::Requester::Main;
-#if !PLATFORM(WIN)
-            adjustMIMETypeIfNecessary(cfResponse.get(), isMainResourceLoad);
-#endif
         }
 
-#if !PLATFORM(IOS)
         if (_CFURLRequestCopyProtocolPropertyForKey(handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
             CFURLResponseSetMIMEType(cfResponse.get(), CFSTR("text/html"));
-#endif // !PLATFORM(IOS)
 
         ResourceResponse resourceResponse(cfResponse.get());
         resourceResponse.setSource(ResourceResponse::Source::Network);
-#if !PLATFORM(WIN)
-        ResourceHandle::getConnectionTimingData(connection.get(), resourceResponse.deprecatedNetworkLoadMetrics());
-#endif
-
         handle->didReceiveResponse(WTFMove(resourceResponse));
     };
 
@@ -297,7 +281,6 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail(CFErrorRef
 
 CFCachedURLResponseRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse(CFCachedURLResponseRef cachedResponse)
 {
-#if PLATFORM(WIN)
     // Workaround for <rdar://problem/6300990> Caching does not respect Vary HTTP header.
     // FIXME: WebCore cache has issues with Vary, too (bug 58797, bug 71509).
     CFURLResponseRef wrappedResponse = CFCachedURLResponseGetWrappedResponse(cachedResponse);
@@ -307,7 +290,6 @@ CFCachedURLResponseRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::
         if (varyValue)
             return nullptr;
     }
-#endif // PLATFORM(WIN)
 
     auto work = [protectedThis = makeRef(*this), cachedResponse = RetainPtr<CFCachedURLResponseRef>(cachedResponse)] () {
         auto& handle = protectedThis->m_handle;
@@ -385,13 +367,6 @@ Boolean ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToPro
         LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace(handle=%p) (%s)", handle, handle->firstRequest().url().string().utf8().data());
 
         ProtectionSpace coreProtectionSpace = ProtectionSpace(protectionSpace.get());
-#if PLATFORM(IOS)
-        if (coreProtectionSpace.authenticationScheme() == ProtectionSpaceAuthenticationSchemeUnknown) {
-            m_boolResult = false;
-            dispatch_semaphore_signal(m_semaphore);
-            return;
-        }
-#endif // PLATFORM(IOS)
         handle->canAuthenticateAgainstProtectionSpace(coreProtectionSpace);
     };
     
index e45d391..7f86ab0 100644 (file)
@@ -43,13 +43,9 @@ static CFStringRef const commonHeaderFields[] = {
 CFURLResponseRef ResourceResponse::cfURLResponse() const
 {
     if (!m_cfResponse && !m_isNull) {
-#if PLATFORM(COCOA)
-        nsURLResponse();
-#else
         RetainPtr<CFURLRef> url = m_url.createCFURL();
         // FIXME: This creates a very incomplete CFURLResponse, which does not even have a status code.
         m_cfResponse = adoptCF(CFURLResponseCreate(0, url.get(), m_mimeType.string().createCFString().get(), m_expectedContentLength, m_textEncodingName.string().createCFString().get(), kCFURLCacheStorageAllowed));
-#endif
     }
 
     return m_cfResponse.get();
@@ -112,12 +108,10 @@ void ResourceResponse::platformLazyInit(InitLevel initLevel)
     m_initLevel = initLevel;
 }
 
-#if !PLATFORM(COCOA)
 CertificateInfo ResourceResponse::platformCertificateInfo() const
 {
     return { };
 }
-#endif
 
 String ResourceResponse::platformSuggestedFilename() const
 {
index 9b735ba..7e05c46 100644 (file)
 #import "config.h"
 #import "CredentialCocoa.h"
 
-#if USE(CFURLCONNECTION)
-@interface NSURLCredential (WebDetails)
-- (id)_initWithCFURLCredential:(CFURLCredentialRef)credential;
-- (CFURLCredentialRef) _CFURLCredential;
-@end
-#endif
-
 namespace WebCore {
 
 static NSURLCredentialPersistence toNSURLCredentialPersistence(CredentialPersistence persistence)
@@ -84,26 +77,12 @@ Credential::Credential(const Credential& original, CredentialPersistence persist
     }
 }
 
-#if USE(CFURLCONNECTION)
-Credential::Credential(CFURLCredentialRef credential)
-    : Credential(adoptNS([[NSURLCredential alloc] _initWithCFURLCredential:credential]).get())
-{
-}
-#endif
-
 Credential::Credential(NSURLCredential *credential)
     : CredentialBase(credential.user, credential.password, toCredentialPersistence(credential.persistence))
     , m_nsCredential(credential)
 {
 }
 
-#if USE(CFURLCONNECTION)
-CFURLCredentialRef Credential::cfCredential() const
-{
-    return [nsCredential() _CFURLCredential];
-}
-#endif
-
 NSURLCredential *Credential::nsCredential() const
 {
     if (m_nsCredential)
index 0a2e2d5..db1fb51 100644 (file)
 #import "config.h"
 #import "ProtectionSpaceCocoa.h"
 
-#if USE(CFURLCONNECTION)
-@interface NSURLProtectionSpace (WebDetails)
-- (CFURLProtectionSpaceRef) _CFURLProtectionSpace;
-- (id)_initWithCFURLProtectionSpace:(CFURLProtectionSpaceRef)cfProtSpace;
-@end
-#endif
-
 namespace WebCore {
 
-#if USE(CFURLCONNECTION)
-ProtectionSpace::ProtectionSpace(CFURLProtectionSpaceRef space)
-    : ProtectionSpace(adoptNS([[NSURLProtectionSpace alloc] _initWithCFURLProtectionSpace:space]).get())
-{
-}
-#endif
-
 static ProtectionSpaceServerType type(NSURLProtectionSpace *space)
 {
     if ([space isProxy]) {
@@ -105,13 +91,6 @@ ProtectionSpace::ProtectionSpace(NSURLProtectionSpace *space)
     m_nsSpace = space;
 }
 
-#if USE(CFURLCONNECTION)
-CFURLProtectionSpaceRef ProtectionSpace::cfSpace() const
-{
-    return [nsSpace() _CFURLProtectionSpace];
-}
-#endif
-
 NSURLProtectionSpace *ProtectionSpace::nsSpace() const
 {
     if (m_nsSpace)
index 62c11c1..b17be3c 100644 (file)
@@ -42,37 +42,9 @@ namespace WebCore {
 NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
 {
     updatePlatformRequest(bodyPolicy);
-#if USE(CFURLCONNECTION)
-    if (!m_nsRequest)
-        const_cast<ResourceRequest*>(this)->updateNSURLRequest();
-#endif
     return [[m_nsRequest.get() retain] autorelease];
 }
 
-#if USE(CFURLCONNECTION)
-
-void ResourceRequest::clearOrUpdateNSURLRequest()
-{
-    // There is client code that extends NSURLRequest and expects to get back, in the delegate
-    // callbacks, an object of the same type that they passed into WebKit. To keep then running, we
-    // create an object of the same type and return that. See <rdar://9843582>.
-    // Also, developers really really want an NSMutableURLRequest so try to create an
-    // NSMutableURLRequest instead of NSURLRequest.
-    static Class nsURLRequestClass = [NSURLRequest class];
-    static Class nsMutableURLRequestClass = [NSMutableURLRequest class];
-    Class requestClass = [m_nsRequest.get() class];
-    
-    if (!m_cfRequest)
-        return;
-    
-    if (requestClass && requestClass != nsURLRequestClass && requestClass != nsMutableURLRequestClass)
-        m_nsRequest = adoptNS([[requestClass alloc] _initWithCFURLRequest:m_cfRequest.get()]);
-    else
-        m_nsRequest = nullptr;
-}
-
-#else
-
 CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
 {
     return [nsURLRequest(bodyPolicy) _CFURLRequest];
@@ -262,8 +234,6 @@ void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession)
     m_nsRequest = adoptNS(copyRequestWithStorageSession(storageSession, m_nsRequest.get()));
 }
 
-#endif // USE(CFURLCONNECTION)
-
 NSURLRequest *copyRequestWithStorageSession(CFURLStorageSessionRef storageSession, NSURLRequest *request)
 {
     if (!storageSession || !request)
index 6969200..25ff75f 100644 (file)
@@ -75,13 +75,8 @@ void ResourceResponse::disableLazyInitialization()
 
 CertificateInfo ResourceResponse::platformCertificateInfo() const
 {
-#if USE(CFURLCONNECTION)
-    ASSERT(m_cfResponse || source() == Source::ServiceWorker);
-    CFURLResponseRef cfResponse = m_cfResponse.get();
-#else
     ASSERT(m_nsResponse || source() == Source::ServiceWorker);
     CFURLResponseRef cfResponse = [m_nsResponse _CFURLResponse];
-#endif
 
     if (!cfResponse)
         return { };
@@ -114,35 +109,6 @@ CertificateInfo ResourceResponse::platformCertificateInfo() const
 #endif
 }
 
-#if USE(CFURLCONNECTION)
-
-NSURLResponse *ResourceResponse::nsURLResponse() const
-{
-    if (!m_nsResponse && !m_cfResponse && !m_isNull) {
-        initNSURLResponse();
-        m_cfResponse = [m_nsResponse.get() _CFURLResponse];
-        return m_nsResponse.get();
-    }
-
-    if (!m_cfResponse)
-        return nil;
-
-    if (!m_nsResponse)
-        m_nsResponse = [NSURLResponse _responseWithCFURLResponse:m_cfResponse.get()];
-
-    return m_nsResponse.get();
-}
-
-ResourceResponse::ResourceResponse(NSURLResponse* nsResponse)
-    : m_initLevel(Uninitialized)
-    , m_cfResponse([nsResponse _CFURLResponse])
-    , m_nsResponse(nsResponse)
-{
-    m_isNull = !nsResponse;
-}
-
-#else
-
 static NSString* const commonHeaderFields[] = {
     @"Age", @"Cache-Control", @"Content-Type", @"Date", @"Etag", @"Expires", @"Last-Modified", @"Pragma"
 };
@@ -242,8 +208,6 @@ bool ResourceResponse::platformCompare(const ResourceResponse& a, const Resource
     return a.nsURLResponse() == b.nsURLResponse();
 }
 
-#endif // USE(CFURLCONNECTION)
-
 } // namespace WebCore
 
 #endif // PLATFORM(COCOA)
diff --git a/Source/WebCore/platform/network/ios/ResourceHandleIOS.mm b/Source/WebCore/platform/network/ios/ResourceHandleIOS.mm
deleted file mode 100644 (file)
index 56abcfb..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011-2017 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.
- */
-
-#import "config.h"
-#import "ResourceHandleInternal.h"
-
-#if USE(CFURLCONNECTION)
-
-#if USE(APPLE_INTERNAL_SDK)
-#import <CFNetwork/CFSocketStreamPriv.h>
-#import <Foundation/NSURLRequestPrivate.h>
-#else
-#import <Foundation/NSURLRequest.h>
-@interface NSURLRequest (Details)
-+ (BOOL)allowsAnyHTTPSCertificateForHost:(NSString *)host;
-+ (NSArray*)allowsSpecificHTTPSCertificateForHost:(NSString *)host;
-@end
-#endif
-
-extern "C" const CFStringRef _kCFStreamSSLTrustedLeafCertificates;
-
-namespace WebCore {
-
-CFMutableDictionaryRef ResourceHandle::createSSLPropertiesFromNSURLRequest(const ResourceRequest& request)
-{
-    NSString *host = request.url().host();
-    NSArray *certificateChain = [NSURLRequest allowsSpecificHTTPSCertificateForHost:host];
-    BOOL allowsAnyCertificate = [NSURLRequest allowsAnyHTTPSCertificateForHost:host];
-    if (!certificateChain && !allowsAnyCertificate)
-        return nullptr;
-
-    CFMutableDictionaryRef sslProperties = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-    if (certificateChain)
-        CFDictionarySetValue(sslProperties, _kCFStreamSSLTrustedLeafCertificates, reinterpret_cast<CFTypeRef>(certificateChain));
-
-    if (allowsAnyCertificate)
-        CFDictionarySetValue(sslProperties, kCFStreamSSLValidatesCertificateChain, kCFBooleanFalse);
-    return sslProperties;
-}
-
-}
-
-#endif
diff --git a/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm b/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm
deleted file mode 100644 (file)
index 5eeb1b3..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2014 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. ``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
- * 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.
- */
-
-#import "config.h"
-#import "ResourceRequest.h"
-
-#if PLATFORM(IOS)
-
-#import <pal/spi/cf/CFNetworkSPI.h>
-
-namespace WebCore {
-
-#if USE(CFURLCONNECTION)
-
-ResourceRequest::ResourceRequest(NSURLRequest *nsRequest)
-    : ResourceRequestBase()
-    , m_cfRequest([nsRequest _CFURLRequest])
-    , m_nsRequest(nsRequest)
-{
-}
-
-void ResourceRequest::updateNSURLRequest()
-{
-    if (m_cfRequest)
-        m_nsRequest = adoptNS([[NSMutableURLRequest alloc] _initWithCFURLRequest:m_cfRequest.get()]);
-}
-
-#endif // USE(CFURLCONNECTION)
-
-} // namespace WebCore
-
-#endif // PLATFORM(IOS)
index 8f9cbf6..fb4de72 100644 (file)
 #import "config.h"
 #import "AuthenticationMac.h"
 
-#import "AuthenticationCF.h"
 #import "AuthenticationChallenge.h"
 #import "AuthenticationClient.h"
 #import "Credential.h"
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <Foundation/NSURLProtectionSpace.h>
 
-#if USE(CFURLCONNECTION)
-#import <pal/spi/cocoa/CFNSURLConnectionSPI.h>
-#endif
-
 using namespace WebCore;
 
 @interface WebCoreAuthenticationClientAsChallengeSender : NSObject <NSURLAuthenticationChallengeSender>
 {
     AuthenticationClient* m_client;
-#if USE(CFURLCONNECTION)
-    CFURLAuthChallengeRef m_cfChallenge;
-#endif
 }
 - (id)initWithAuthenticationClient:(AuthenticationClient*)client;
 - (AuthenticationClient*)client;
@@ -101,47 +93,10 @@ using namespace WebCore;
         m_client->receivedCancellation(core(challenge));
 }
 
-#if USE(CFURLCONNECTION)
-- (void)setCFChallenge:(CFURLAuthChallengeRef)challenge
-{
-    m_cfChallenge = challenge;
-}
-
-- (CFURLAuthChallengeRef)cfChallenge
-{
-    return m_cfChallenge;
-}
-#endif
-
 @end
 
 namespace WebCore {
 
-#if USE(CFURLCONNECTION)
-
-AuthenticationChallenge core(NSURLAuthenticationChallenge *macChallenge)
-{
-    WebCoreAuthenticationClientAsChallengeSender *challengeSender = (WebCoreAuthenticationClientAsChallengeSender*) [macChallenge sender];
-    return AuthenticationChallenge([challengeSender cfChallenge], [challengeSender client]);
-}
-
-NSURLAuthenticationChallenge *mac(const AuthenticationChallenge& coreChallenge)
-{
-    AuthenticationClient* authClient = coreChallenge.authenticationClient();
-    RetainPtr<WebCoreAuthenticationClientAsChallengeSender> challengeSender = adoptNS([[WebCoreAuthenticationClientAsChallengeSender alloc] initWithAuthenticationClient:authClient]);
-    RetainPtr<CFURLAuthChallengeRef> authChallenge = coreChallenge.cfURLAuthChallengeRef();
-    if (!authChallenge)
-        authChallenge = adoptCF(createCF(coreChallenge));
-    [challengeSender.get() setCFChallenge:authChallenge.get()];
-#if PLATFORM(IOS)
-    return [[NSURLAuthenticationChallenge _createAuthenticationChallengeForCFAuthChallenge:authChallenge.get() sender:challengeSender.get()] autorelease];
-#else
-    return [[NSURLAuthenticationChallenge _authenticationChallengeForCFAuthChallenge:authChallenge.get() sender:challengeSender.get()] autorelease];
-#endif
-}
-
-#else
-
 AuthenticationChallenge::AuthenticationChallenge(const ProtectionSpace& protectionSpace,
                                                  const Credential& proposedCredential,
                                                  unsigned previousFailureCount,
@@ -183,7 +138,7 @@ AuthenticationClient* AuthenticationChallenge::authenticationClient() const
     if ([m_sender.get() isMemberOfClass:[WebCoreAuthenticationClientAsChallengeSender class]])
         return [static_cast<WebCoreAuthenticationClientAsChallengeSender*>(m_sender.get()) client];
     
-    return 0;
+    return nullptr;
 }
 
 bool AuthenticationChallenge::platformCompare(const AuthenticationChallenge& a, const AuthenticationChallenge& b)
@@ -202,12 +157,7 @@ NSURLAuthenticationChallenge *mac(const AuthenticationChallenge& coreChallenge)
     if (coreChallenge.nsURLAuthenticationChallenge())
         return coreChallenge.nsURLAuthenticationChallenge();
         
-    return [[[NSURLAuthenticationChallenge alloc] initWithProtectionSpace:coreChallenge.protectionSpace().nsSpace()
-                                                       proposedCredential:coreChallenge.proposedCredential().nsCredential()
-                                                     previousFailureCount:coreChallenge.previousFailureCount()
-                                                          failureResponse:coreChallenge.failureResponse().nsURLResponse()
-                                                                    error:coreChallenge.error()
-                                                                   sender:coreChallenge.sender()] autorelease];
+    return [[[NSURLAuthenticationChallenge alloc] initWithProtectionSpace:coreChallenge.protectionSpace().nsSpace() proposedCredential:coreChallenge.proposedCredential().nsCredential() previousFailureCount:coreChallenge.previousFailureCount() failureResponse:coreChallenge.failureResponse().nsURLResponse() error:coreChallenge.error() sender:coreChallenge.sender()] autorelease];
 }
 
 AuthenticationChallenge core(NSURLAuthenticationChallenge *macChallenge)
@@ -215,6 +165,4 @@ AuthenticationChallenge core(NSURLAuthenticationChallenge *macChallenge)
     return AuthenticationChallenge(macChallenge);
 }
 
-#endif // USE(CFURLCONNECTION)
-
 } // namespace WebCore
index 25bc3e7..ddeeba8 100644 (file)
@@ -31,8 +31,6 @@
 #import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 
-#if !USE(CFURLCONNECTION)
-
 #import "Cookie.h"
 #import "CookieStorage.h"
 #import "URL.h"
@@ -43,8 +41,6 @@
 - (CFURLRef)_cfurl;
 @end
 
-#endif
-
 namespace WebCore {
 
 static NSArray *httpCookies(CFHTTPCookieStorageRef cookieStorage)
@@ -66,8 +62,6 @@ static void deleteHTTPCookie(CFHTTPCookieStorageRef cookieStorage, NSHTTPCookie
     CFHTTPCookieStorageDeleteCookie(cookieStorage, [cookie _GetInternalCFHTTPCookie]);
 }
 
-#if !USE(CFURLCONNECTION)
-
 static NSArray *httpCookiesForURL(CFHTTPCookieStorageRef cookieStorage, NSURL *firstParty, NSURL *url)
 {
     if (!cookieStorage)
@@ -348,8 +342,6 @@ void deleteAllCookies(const NetworkStorageSession& session)
     deleteAllHTTPCookies(session.cookieStorage().get());
 }
 
-#endif // !USE(CFURLCONNECTION)
-
 void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
index c6badb7..4ed223c 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "CredentialStorage.h"
 
-#if !USE(CFURLCONNECTION)
-
 #include "AuthenticationMac.h"
 #include "Credential.h"
 #include "ProtectionSpace.h"
@@ -41,5 +39,3 @@ Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& pr
 }
 
 } // namespace WebCore
-
-#endif // !USE(CFURLCONNECTION)
index ad30c65..327218e 100644 (file)
@@ -28,8 +28,6 @@
 
 #pragma once
 
-#if !USE(CFURLCONNECTION)
-
 #include <wtf/Forward.h>
 #include <wtf/RetainPtr.h>
 
@@ -47,5 +45,3 @@ FormData* httpBodyFromStream(NSInputStream *);
 CFStringRef formDataStreamLengthPropertyName();
 
 } // namespace WebCore
-
-#endif // !USE(CFURLCONNECTION)
index 37b8f4a..d9caf40 100644 (file)
@@ -29,8 +29,6 @@
 #import "config.h"
 #import "FormDataStreamMac.h"
 
-#if !USE(CFURLCONNECTION)
-
 #import "FormDataStreamCFNet.h"
 #import <pal/spi/cf/CFNetworkSPI.h>
 
@@ -52,5 +50,3 @@ FormData* httpBodyFromStream(NSInputStream *stream)
 }
 
 } // namespace WebCore
-
-#endif // !USE(CFURLCONNECTION)
index feb7b8d..709b699 100644 (file)
 #import <Foundation/Foundation.h>
 #import <wtf/BlockObjCExceptions.h>
 
-#if PLATFORM(IOS) && USE(CFURLCONNECTION) && USE(APPLE_INTERNAL_SDK)
-#import <CFNetwork/CFSocketStreamPriv.h>
-#endif
-
-#if USE(CFURLCONNECTION)
-extern "C" {
-const CFStringRef _kCFStreamPropertySSLClientCertificates;
-const CFStringRef _kCFStreamPropertySSLClientCertificateState;
-}
-#endif
-
 @interface NSError (WebExtras)
 - (NSString *)_web_localizedDescription;
 @end
@@ -98,85 +87,6 @@ static NSDictionary* dictionaryThatCanCode(NSDictionary* src)
 
 @end
 
-
-#if USE(CFURLCONNECTION)
-static NSError *NSErrorFromCFError(CFErrorRef cfError, NSURL *url)
-{
-    CFIndex errCode = CFErrorGetCode(cfError);
-    if (CFEqual(CFErrorGetDomain(cfError), kCFErrorDomainCFNetwork) && errCode <= kCFURLErrorUnknown && errCode > -4000) {
-        // This is an URL error and needs to be translated to the NSURLErrorDomain
-        id keys[10], values[10];
-        CFDictionaryRef userInfo = CFErrorCopyUserInfo(cfError);
-        NSError *result;
-        NSInteger count = 0;
-
-        if (url) {
-            keys[count] = NSURLErrorFailingURLErrorKey;
-            values[count] = url;
-            count++;
-
-            keys[count] = NSURLErrorFailingURLStringErrorKey;
-            values[count] = [url absoluteString];
-            count++;
-        }
-
-        values[count] = (id)CFDictionaryGetValue(userInfo, kCFErrorLocalizedDescriptionKey);
-        if (values[count]) {
-            keys[count] = NSLocalizedDescriptionKey;
-            count++;
-        }
-
-        values[count] = (id)CFDictionaryGetValue(userInfo, kCFErrorLocalizedFailureReasonKey);
-        if (values[count]) {
-            keys[count] = NSLocalizedFailureReasonErrorKey;
-            count++;
-        }
-
-        values[count] = (id)CFDictionaryGetValue(userInfo, kCFErrorLocalizedRecoverySuggestionKey);
-        if (values[count]) {
-            keys[count] = NSLocalizedRecoverySuggestionErrorKey;
-            count++;
-        }
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        if (userInfo && (values[count] = (id)CFDictionaryGetValue(userInfo, kCFStreamPropertySSLPeerCertificates)) != nil) {
-            // Need to translate the cert
-            keys[count] = @"NSErrorPeerCertificateChainKey";
-            count++;
-
-            values[count] = (id)CFDictionaryGetValue(userInfo, _kCFStreamPropertySSLClientCertificates);
-            if (values[count]) {
-                keys[count] = @"NSErrorClientCertificateChainKey";
-                count++;
-            }
-
-            values[count] = (id)CFDictionaryGetValue(userInfo, _kCFStreamPropertySSLClientCertificateState);
-            if (values[count]) {
-                keys[count] = @"NSErrorClientCertificateStateKey";
-                count++;
-            }
-        }
-#pragma clang diagnostic pop
-
-        if (userInfo && (values[count] = (id)CFDictionaryGetValue(userInfo, kCFStreamPropertySSLPeerTrust)) != nil) {
-            keys[count] = NSURLErrorFailingURLPeerTrustErrorKey;
-            count++;
-        }
-
-        keys[count] = NSUnderlyingErrorKey;
-        values[count] = (id)cfError;
-        count++;
-
-        result = [WebCustomNSURLError errorWithDomain:NSURLErrorDomain code:(errCode == kCFURLErrorUnknown ? (CFIndex)NSURLErrorUnknown : errCode) userInfo:[NSDictionary dictionaryWithObjects:values forKeys:keys count:count]];
-        if (userInfo)
-            CFRelease(userInfo);
-        return result;
-    }
-    return (NSError *)cfError;
-}
-#endif // USE(CFURLCONNECTION)
-
 #endif // PLATFORM(IOS)
 
 namespace WebCore {
@@ -197,53 +107,6 @@ static RetainPtr<NSError> createNSErrorFromResourceErrorBase(const ResourceError
     return adoptNS([[NSError alloc] initWithDomain:resourceError.domain() code:resourceError.errorCode() userInfo:userInfo.get()]);
 }
 
-#if USE(CFURLCONNECTION)
-
-ResourceError::ResourceError(NSError *error)
-    : ResourceErrorBase(Type::Null)
-    , m_dataIsUpToDate(false)
-    , m_platformError(reinterpret_cast<CFErrorRef>(error))
-{
-    if (error)
-        setType(([error code] == NSURLErrorTimedOut) ? Type::Timeout : Type::General);
-}
-
-NSError *ResourceError::nsError() const
-{
-    if (isNull()) {
-        ASSERT(!m_platformError);
-        return nil;
-    }
-
-    if (m_platformNSError)
-        return m_platformNSError.get();
-
-    if (m_platformError) {
-        CFErrorRef error = m_platformError.get();
-        RetainPtr<CFDictionaryRef> userInfo = adoptCF(CFErrorCopyUserInfo(error));
-#if PLATFORM(IOS)
-        m_platformNSError = NSErrorFromCFError(error, (NSURL *)[(NSDictionary *)userInfo.get() objectForKey:(id) kCFURLErrorFailingURLErrorKey]);
-        // If NSErrorFromCFError created a new NSError for us, return that.
-        if (m_platformNSError.get() != (NSError *)error)
-            return m_platformNSError.get();
-
-        // Otherwise fall through to create a new NSError from the CFError.
-#endif
-        m_platformNSError = adoptNS([[NSError alloc] initWithDomain:(NSString *)CFErrorGetDomain(error) code:CFErrorGetCode(error) userInfo:(NSDictionary *)userInfo.get()]);
-        return m_platformNSError.get();
-    }
-
-    m_platformNSError = createNSErrorFromResourceErrorBase(*this);
-    return m_platformNSError.get();
-}
-
-ResourceError::operator NSError *() const
-{
-    return nsError();
-}
-
-#else
-
 ResourceError::ResourceError(NSError *nsError)
     : ResourceErrorBase(Type::Null)
     , m_dataIsUpToDate(false)
@@ -316,6 +179,4 @@ ResourceError::operator CFErrorRef() const
     return cfError();
 }
 
-#endif // USE(CFURLCONNECTION)
-
 } // namespace WebCore
index e665afe..8a829ce 100644 (file)
 #import <wtf/text/Base64.h>
 #import <wtf/text/CString.h>
 
-#if USE(CFURLCONNECTION)
-#if USE(APPLE_INTERNAL_SDK)
-#import <CFNetwork/CFURLConnectionPriv.h>
-#endif
-typedef struct _CFURLConnection* CFURLConnectionRef;
-extern "C" {
-CFDictionaryRef _CFURLConnectionCopyTimingData(CFURLConnectionRef);
-}
-#endif // USE(CFURLCONNECTION)
-
 #if PLATFORM(IOS)
 #import "RuntimeApplicationChecks.h"
 #import "WebCoreThreadRun.h"
@@ -78,8 +68,6 @@ using namespace WebCore;
 
 namespace WebCore {
     
-#if !USE(CFURLCONNECTION)
-    
 static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
 {
     String authenticationHeader = "Basic " + base64Encode(String(credential.user() + ":" + credential.password()).utf8());
@@ -113,12 +101,7 @@ ResourceHandle::~ResourceHandle()
 #if PLATFORM(IOS)
 static bool synchronousWillSendRequestEnabled()
 {
-#if PLATFORM(IOS)
     static bool disabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisableSynchronousWillSendRequestPreferenceKey"] || IOSApplication::isIBooks();
-#else
-    static bool disabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisableSynchronousWillSendRequestPreferenceKey"];
-#endif
-
     return !disabled;
 }
 #endif
@@ -320,8 +303,6 @@ void ResourceHandle::platformSetDefersLoading(bool defers)
         [d->m_connection setDefersCallbacks:defers];
 }
 
-#if !USE(CFURLCONNECTION)
-
 void ResourceHandle::schedule(SchedulePair& pair)
 {
     NSRunLoop *runLoop = pair.nsRunLoop();
@@ -336,8 +317,6 @@ void ResourceHandle::unschedule(SchedulePair& pair)
         [d->m_connection.get() unscheduleFromRunLoop:runLoop forMode:(NSString *)pair.mode()];
 }
 
-#endif
-
 id ResourceHandle::makeDelegate(bool shouldUseCredentialStorage, MessageQueue<Function<void()>>* queue)
 {
     ASSERT(!d->m_delegate);
@@ -689,22 +668,9 @@ void ResourceHandle::continueWillCacheResponse(NSCachedURLResponse *response)
     [(id)delegate() continueWillCacheResponse:response];
 }
 
-#endif // !USE(CFURLCONNECTION)
-
-#if USE(CFURLCONNECTION)
-
-void ResourceHandle::getConnectionTimingData(CFURLConnectionRef connection, NetworkLoadMetrics& timing)
-{
-    copyTimingData((__bridge NSDictionary*)adoptCF(_CFURLConnectionCopyTimingData(connection)).get(), timing);
-}
-
-#else
-
 void ResourceHandle::getConnectionTimingData(NSURLConnection *connection, NetworkLoadMetrics& timing)
 {
     copyTimingData([connection _timingData], timing);
 }
 
-#endif
-
 } // namespace WebCore
diff --git a/Source/WebCore/platform/network/mac/ResourceRequestMac.mm b/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
deleted file mode 100644 (file)
index a472aee..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2008 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. ``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
- * 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. 
- */
-
-#import "config.h"
-#import "ResourceRequest.h"
-
-#if PLATFORM(MAC)
-
-#import <Foundation/Foundation.h>
-#import <pal/spi/cf/CFNetworkSPI.h>
-
-namespace WebCore {
-
-#if USE(CFURLCONNECTION)
-
-ResourceRequest::ResourceRequest(NSURLRequest *nsRequest)
-    : ResourceRequestBase()
-    , m_cfRequest([nsRequest _CFURLRequest])
-    , m_nsRequest(nsRequest)
-{
-}
-
-void ResourceRequest::updateNSURLRequest()
-{
-    if (m_cfRequest)
-        m_nsRequest = adoptNS([[NSURLRequest alloc] _initWithCFURLRequest:m_cfRequest.get()]);
-}
-
-#endif
-
-} // namespace WebCore
-
-#endif
index dbad144..65f76df 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "SynchronousLoaderClient.h"
 
-#if !USE(CFURLCONNECTION)
-
 #include "AuthenticationChallenge.h"
 
 namespace WebCore {
@@ -38,14 +36,10 @@ void SynchronousLoaderClient::didReceiveAuthenticationChallenge(ResourceHandle*,
     [challenge.sender() continueWithoutCredentialForAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()];
 }
 
-#if !USE(CFURLCONNECTION)
 ResourceError SynchronousLoaderClient::platformBadResponseError()
 {
     RetainPtr<NSError> error = adoptNS([[NSError alloc] initWithDomain:NSURLErrorDomain code:NSURLErrorBadServerResponse userInfo:nil]);
     return error.get();
 }
-#endif
 
 }
-
-#endif // !USE(CFURLCONNECTION)
index 334e34d..56f4e6d 100644 (file)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if !USE(CFURLCONNECTION)
-
 #include <dispatch/dispatch.h>
 #include <wtf/Function.h>
 #include <wtf/MessageQueue.h>
@@ -57,5 +55,3 @@ class ResourceHandle;
 @interface WebCoreResourceHandleWithCredentialStorageAsOperationQueueDelegate : WebCoreResourceHandleAsOperationQueueDelegate
 
 @end
-
-#endif // !USE(CFURLCONNECTION)
index 1f7d6ce..5a70901 100644 (file)
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "WebCoreResourceHandleAsOperationQueueDelegate.h"
 
-#if !USE(CFURLCONNECTION)
-
 #import "AuthenticationChallenge.h"
 #import "AuthenticationMac.h"
 #import "Logging.h"
@@ -358,6 +356,3 @@ static SchedulePairHashSet* scheduledRunLoopPairs(ResourceHandle* handle)
 }
 
 @end
-
-#endif // !USE(CFURLCONNECTION)
-
index 7cfeab7..71311ff 100644 (file)
@@ -327,7 +327,6 @@ void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse, bool isMainResourceL
 }
 #endif
 
-#if !USE(CFURLCONNECTION)
 NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentRequest, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
 {
     if (redirectResponse)
@@ -341,6 +340,5 @@ NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentReques
     NSDictionary *synthesizedResponseHeaderFields = @{ @"Location": [[newRequest URL] absoluteString], @"Cache-Control": @"no-store" };
     return [[[NSHTTPURLResponse alloc] initWithURL:[currentRequest URL] statusCode:302 HTTPVersion:(NSString *)kCFHTTPVersion1_1 headerFields:synthesizedResponseHeaderFields] autorelease];
 }
-#endif
 
 }
index 1ac0d02..ab3b5db 100644 (file)
@@ -1,3 +1,12 @@
+2017-11-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove Cocoa CFURLConnection loading code
+        https://bugs.webkit.org/show_bug.cgi?id=179688
+
+        Reviewed by Antti Koivisto.
+
+        * NetworkProcess/Downloads/Download.h:
+
 2017-11-14  Daniel Bates  <dabates@apple.com>
 
         Update comment in FeatureDefines.xcconfig to reflect location of Visual Studio property files
index 9ee28ef..fc6f237 100644 (file)
@@ -151,9 +151,6 @@ private:
     RetainPtr<NSURLDownload> m_nsURLDownload;
     RetainPtr<WKDownloadAsDelegate> m_delegate;
 #endif
-#if USE(CFURLCONNECTION)
-    RetainPtr<CFURLDownloadRef> m_download;
-#endif
     std::unique_ptr<WebCore::ResourceHandleClient> m_downloadClient;
     RefPtr<WebCore::ResourceHandle> m_resourceHandle;
 #endif // USE(NETWORK_SESSION)
index 01065f6..a3f18bd 100644 (file)
@@ -1,3 +1,13 @@
+2017-11-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove Cocoa CFURLConnection loading code
+        https://bugs.webkit.org/show_bug.cgi?id=179688
+
+        Reviewed by Antti Koivisto.
+
+        * WebCoreSupport/WebResourceLoadScheduler.cpp:
+        (WebResourceLoadScheduler::scheduleLoad):
+
 2017-11-06  Per Arne Vollan  <pvollan@apple.com>
 
         [Win] Add WebKitQuartzCoreAdditions library.
index f0a9439..350f041 100644 (file)
@@ -148,7 +148,7 @@ void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader)
     bool hadRequests = host->hasRequests();
     host->schedule(resourceLoader, priority);
 
-#if PLATFORM(COCOA) || USE(CFURLCONNECTION)
+#if PLATFORM(COCOA)
     if (ResourceRequest::resourcePrioritiesEnabled() && !isSuspendingPendingRequests()) {
         // Serve all requests at once to keep the pipeline full at the network layer.
         // FIXME: Does this code do anything useful, given that we also set maxRequestsInFlightPerHost to effectively unlimited on these platforms?
index 10be818..16a4731 100644 (file)
@@ -1,3 +1,20 @@
+2017-11-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove Cocoa CFURLConnection loading code
+        https://bugs.webkit.org/show_bug.cgi?id=179688
+
+        Reviewed by Antti Koivisto.
+
+        * Misc/WebDownload.mm:
+        (-[WebDownload _initWithLoadingCFURLConnection:request:response:delegate:proxy:]): Deleted.
+        * Misc/WebDownloadInternal.h:
+        * Plugins/WebBaseNetscapePluginView.mm:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::convertMainResourceLoadToDownload):
+        * WebView/WebView.mm:
+        (-[WebView scheduleInRunLoop:forMode:]):
+        (-[WebView unscheduleFromRunLoop:forMode:]):
+
 2017-11-14  Daniel Bates  <dabates@apple.com>
 
         Update comment in FeatureDefines.xcconfig to reflect location of Visual Studio property files
index bd77d38..98c7cca 100644 (file)
@@ -29,7 +29,6 @@
 #import <WebKitLegacy/WebDownload.h>
 
 #import <Foundation/NSURLAuthenticationChallenge.h>
-#import <WebCore/AuthenticationCF.h>
 #import <WebCore/AuthenticationMac.h>
 #import <WebCore/Credential.h>
 #import <WebCore/CredentialStorage.h>
 
 #import "WebTypesInternal.h"
 
-#if USE(CFURLCONNECTION)
-#import <CFNetwork/CFNetwork.h>
-#import <CFNetwork/CFURLConnection.h>
-#endif
-
 using namespace WebCore;
 
 @class NSURLConnectionDelegateProxy;
@@ -61,10 +55,6 @@ using namespace WebCore;
               delegate:(id)delegate
              directory:(NSString *)directory;
 
-#if USE(CFURLCONNECTION)
-- (id)_initWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy;
-#endif
-
 @end
 
 @interface WebDownloadInternal : NSObject <NSURLDownloadDelegate>
@@ -227,14 +217,6 @@ using namespace WebCore;
     return [super _initWithLoadingConnection:connection request:request response:response delegate:_webInternal proxy:proxy];
 }
 
-#if USE(CFURLCONNECTION)
-- (id)_initWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy
-{
-    [self _setRealDelegate:delegate];
-    return [super _initWithLoadingCFURLConnection:connection request:request response:response delegate:_webInternal proxy:proxy];
-}
-#endif
-
 - (id)_initWithRequest:(NSURLRequest *)request
               delegate:(id)delegate
              directory:(NSString *)directory
index 589fc93..a33ce90 100644 (file)
 */
  
 #import <WebKitLegacy/WebDownload.h>
-
-#if USE(CFURLCONNECTION)
-#import <CFNetwork/CFURLConnection.h>
-#endif
  
 @interface WebDownload (WebDownloadCreation)
 +(id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)r delegate:(id)delegate proxy:(id)proxy;
 
 +(id)_downloadWithRequest:(NSURLRequest *)request delegate:(id)delegate directory:(NSString *)directory;
 
-#if USE(CFURLCONNECTION)
-+ (id)_downloadWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(id)proxy;
-#endif
-
 @end
index e2d496a..2e5dbbe 100644 (file)
@@ -37,7 +37,6 @@
 #import "WebNSURLRequestExtras.h"
 #import "WebView.h"
 #import "WebViewInternal.h"
-#import <WebCore/AuthenticationCF.h>
 #import <WebCore/AuthenticationMac.h>
 #import <WebCore/BitmapImage.h>
 #import <WebCore/Credential.h>
index 4ee6d15..173b41c 100644 (file)
@@ -73,7 +73,6 @@
 #import "WebUIDelegatePrivate.h"
 #import "WebViewInternal.h"
 #import <JavaScriptCore/JSContextInternal.h>
-#import <WebCore/AuthenticationCF.h>
 #import <WebCore/AuthenticationMac.h>
 #import <WebCore/BackForwardController.h>
 #import <WebCore/BitmapImage.h>
@@ -320,13 +319,7 @@ void WebFrameLoaderClient::convertMainResourceLoadToDownload(DocumentLoader* doc
 
     ResourceHandle* handle = mainResourceLoader->handle();
 
-#if USE(CFURLCONNECTION)
-    ASSERT([WebDownload respondsToSelector:@selector(_downloadWithLoadingCFURLConnection:request:response:delegate:proxy:)]);
-    auto connection = handle->releaseConnectionForDownload();
-    [WebDownload _downloadWithLoadingCFURLConnection:connection.get() request:request.cfURLRequest(UpdateHTTPBody) response:response.cfURLResponse() delegate:[webView downloadDelegate] proxy:nil];
-#else
     [WebDownload _downloadWithLoadingConnection:handle->connection() request:request.nsURLRequest(UpdateHTTPBody) response:response.nsURLResponse() delegate:[webView downloadDelegate] proxy:nil];
-#endif
 }
 
 bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(DocumentLoader* loader, const ResourceRequest& request, const ResourceResponse& response, int length)
index 44c4973..ec02d70 100644 (file)
@@ -1867,7 +1867,7 @@ static NSString *classIBCreatorID = nil;
 + (void)_setCurrentNetworkLoaderSessionCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy
 {
     RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage();
-    ASSERT(cookieStorage); // Will fail when building without USE(CFURLCONNECTION) and NetworkStorageSession::switchToNewTestingSession() was not called beforehand.
+    ASSERT(cookieStorage); // Will fail when NetworkStorageSession::switchToNewTestingSession() was not called beforehand.
     CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
 }
 
index c790755..68031a1 100644 (file)
@@ -7457,24 +7457,14 @@ static TextCheckingResult textCheckingResultFromNSTextCheckingResult(NSTextCheck
 
 - (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode
 {
-#if USE(CFURLCONNECTION)
-    CFRunLoopRef schedulePairRunLoop = [runLoop getCFRunLoop];
-#else
-    NSRunLoop *schedulePairRunLoop = runLoop;
-#endif
     if (runLoop && mode)
-        core(self)->addSchedulePair(SchedulePair::create(schedulePairRunLoop, (CFStringRef)mode));
+        core(self)->addSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode));
 }
 
 - (void)unscheduleFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode
 {
-#if USE(CFURLCONNECTION)
-    CFRunLoopRef schedulePairRunLoop = [runLoop getCFRunLoop];
-#else
-    NSRunLoop *schedulePairRunLoop = runLoop;
-#endif
     if (runLoop && mode)
-        core(self)->removeSchedulePair(SchedulePair::create(schedulePairRunLoop, (CFStringRef)mode));
+        core(self)->removeSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode));
 }
 
 static BOOL findString(NSView <WebDocumentSearching> *searchView, NSString *string, WebFindOptions options)