Changeset 224846 in webkit


Ignore:
Timestamp:
Nov 14, 2017, 2:20:42 PM (8 years ago)
Author:
achristensen@apple.com
Message:

Remove Cocoa CFURLConnection loading code
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:
Location:
trunk/Source
Files:
3 deleted
59 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r224801 r224846  
     12017-11-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove Cocoa CFURLConnection loading code
     4        https://bugs.webkit.org/show_bug.cgi?id=179688
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * wtf/SchedulePair.h:
     9        * wtf/SchedulePairMac.mm:
     10
    1112017-11-13  Brady Eidson  <beidson@apple.com>
    212
  • trunk/Source/WTF/wtf/SchedulePair.h

    r218594 r224846  
    3535#include <wtf/text/WTFString.h>
    3636
    37 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     37#if PLATFORM(COCOA)
    3838OBJC_CLASS NSRunLoop;
    3939#endif
     
    4545    static Ref<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
    4646
    47 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     47#if PLATFORM(COCOA)
    4848    static Ref<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
    4949    NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
     
    6363    }
    6464
    65 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     65#if PLATFORM(COCOA)
    6666    WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef);
    6767    RetainPtr<NSRunLoop*> m_nsRunLoop;
  • trunk/Source/WTF/wtf/SchedulePairMac.mm

    r207585 r224846  
    3030#include "SchedulePair.h"
    3131
    32 #if !USE(CFURLCONNECTION)
    33 
    3432namespace WTF {
    3533
     
    4341
    4442} // namespace
    45 
    46 #endif
  • trunk/Source/WebCore/ChangeLog

    r224841 r224846  
     12017-11-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove Cocoa CFURLConnection loading code
     4        https://bugs.webkit.org/show_bug.cgi?id=179688
     5
     6        Reviewed by Antti Koivisto.
     7
     8        CFURLConnection is only used on the AppleWin port now.
     9
     10        * PlatformMac.cmake:
     11        * SourcesCocoa.txt:
     12        * SourcesIOS.txt:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * loader/DocumentLoader.h:
     15        * loader/EmptyFrameLoaderClient.h:
     16        * loader/FrameLoaderClient.h:
     17        * loader/ResourceLoader.cpp:
     18        * loader/ResourceLoader.h:
     19        * loader/SubresourceLoader.h:
     20        * loader/cf/ResourceLoaderCFNet.cpp:
     21        * loader/cocoa/SubresourceLoaderCocoa.mm:
     22        * loader/mac/DocumentLoaderMac.cpp:
     23        * loader/mac/ResourceLoaderMac.mm:
     24        * page/mac/PageMac.mm:
     25        (WebCore::Page::platformInitialize):
     26        (WebCore::Page::addSchedulePair):
     27        (WebCore::Page::removeSchedulePair):
     28        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     29        (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge):
     30        (WebCore::WebCoreNSURLAuthenticationChallengeClient::create): Deleted.
     31        (WebCore::WebCoreNSURLAuthenticationChallengeClient::WebCoreNSURLAuthenticationChallengeClient): Deleted.
     32        (): Deleted.
     33        * platform/network/ProtectionSpaceBase.cpp:
     34        * platform/network/ResourceHandle.h:
     35        * platform/network/ResourceHandleInternal.h:
     36        * platform/network/cf/AuthenticationCF.cpp:
     37        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     38        (WebCore::createCF):
     39        (WebCore::core):
     40        (): Deleted.
     41        * platform/network/cf/AuthenticationCF.h:
     42        * platform/network/cf/CookieJarCFNet.cpp:
     43        (WebCore::copyCookiesForURLWithFirstPartyURL):
     44        (WebCore::createCookies):
     45        (WebCore::deleteAllCookiesModifiedSince):
     46        * platform/network/cf/CookieStorageCFNet.cpp:
     47        * platform/network/cf/CredentialStorageCFNet.cpp:
     48        (WebCore::CredentialStorage::getFromPersistentStorage):
     49        * platform/network/cf/ResourceErrorCF.cpp:
     50        (WebCore::ResourceError::setCertificate):
     51        (WebCore::ResourceError::platformLazyInit):
     52        (WebCore::ResourceError::doPlatformIsolatedCopy):
     53        (WebCore::ResourceError::cfError const):
     54        * platform/network/cf/ResourceHandleCFNet.cpp:
     55        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
     56        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
     57        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest):
     58        (WebCore::installHookToRemoveCFNetworkMessageBlockingMainThread):
     59        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling):
     60        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
     61        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse):
     62        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace):
     63        * platform/network/cocoa/CredentialCocoa.mm:
     64        (WebCore::Credential::cfCredential const): Deleted.
     65        * platform/network/cocoa/ProtectionSpaceCocoa.mm:
     66        (WebCore::ProtectionSpace::cfSpace const): Deleted.
     67        * platform/network/cocoa/ResourceRequestCocoa.mm:
     68        (WebCore::ResourceRequest::nsURLRequest const):
     69        (WebCore::ResourceRequest::clearOrUpdateNSURLRequest): Deleted.
     70        * platform/network/cocoa/ResourceResponseCocoa.mm:
     71        (WebCore::ResourceResponse::platformCertificateInfo const):
     72        (WebCore::ResourceResponse::ResourceResponse): Deleted.
     73        * platform/network/ios/ResourceHandleIOS.mm: Removed.
     74        * platform/network/mac/AuthenticationMac.mm:
     75        (WebCore::AuthenticationChallenge::authenticationClient const):
     76        (WebCore::mac):
     77        (-[WebCoreAuthenticationClientAsChallengeSender setCFChallenge:]): Deleted.
     78        (-[WebCoreAuthenticationClientAsChallengeSender cfChallenge]): Deleted.
     79        * platform/network/mac/ResourceHandleMac.mm:
     80        (WebCore::synchronousWillSendRequestEnabled):
     81        * platform/network/mac/ResourceRequestMac.mm: Removed.
     82
    1832017-11-14  Daniel Bates  <dabates@apple.com>
    284
  • trunk/Source/WebCore/PlatformMac.cmake

    r224267 r224846  
    442442    platform/mediastream/mac/MockRealtimeVideoSourceMac.mm
    443443
    444     platform/network/cf/AuthenticationCF.cpp
    445     platform/network/cf/CookieJarCFNet.cpp
    446     platform/network/cf/CookieStorageCFNet.cpp
    447     platform/network/cf/CredentialStorageCFNet.cpp
    448444    platform/network/cf/DNSCFNet.cpp
    449445    platform/network/cf/FormDataStreamCFNet.cpp
    450     platform/network/cf/LoaderRunLoopCF.cpp
    451446    platform/network/cf/NetworkStorageSessionCFNet.cpp
    452447    platform/network/cf/ProxyServerCFNet.cpp
    453     platform/network/cf/ResourceErrorCF.cpp
    454448    platform/network/cf/ResourceRequestCFNet.cpp
    455     platform/network/cf/ResourceResponseCFNet.cpp
    456449    platform/network/cf/SocketStreamHandleImplCFNet.cpp
    457     platform/network/cf/SynchronousLoaderClientCFNet.cpp
    458     platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
    459450
    460451    platform/network/cocoa/CookieCocoa.mm
  • trunk/Source/WebCore/SourcesCocoa.txt

    r224731 r224846  
    8787loader/cocoa/DiskCacheMonitorCocoa.mm
    8888loader/cocoa/SubresourceLoaderCocoa.mm
    89 
    90 loader/cf/ResourceLoaderCFNet.cpp
    9189
    9290loader/mac/DocumentLoaderMac.cpp
     
    316314platform/mock/MediaPlaybackTargetMock.cpp
    317315
    318 platform/network/cf/AuthenticationCF.cpp
    319 platform/network/cf/CookieJarCFNet.cpp
    320 platform/network/cf/CookieStorageCFNet.cpp
    321 platform/network/cf/CredentialStorageCFNet.cpp
    322316platform/network/cf/DNSCFNet.cpp
    323317platform/network/cf/FormDataStreamCFNet.cpp
    324 platform/network/cf/LoaderRunLoopCF.cpp
    325318platform/network/cf/NetworkStorageSessionCFNet.cpp
    326319platform/network/cf/ProxyServerCFNet.cpp
    327 platform/network/cf/ResourceErrorCF.cpp
    328320platform/network/cf/ResourceRequestCFNet.cpp
    329 platform/network/cf/ResourceResponseCFNet.cpp
    330321platform/network/cf/SocketStreamHandleImplCFNet.cpp
    331 platform/network/cf/SynchronousLoaderClientCFNet.cpp
    332322
    333323platform/network/cocoa/CookieCocoa.mm
     
    378368
    379369platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
    380 
    381 platform/network/cf/ResourceHandleCFNet.cpp
    382 platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
    383 
    384370
    385371#if ENABLE_APPLE_PAY
  • trunk/Source/WebCore/SourcesIOS.txt

    r224123 r224846  
    115115platform/network/ios/NetworkStateNotifierIOS.mm
    116116platform/network/ios/PreviewConverter.mm
    117 platform/network/ios/ResourceHandleIOS.mm
    118 platform/network/ios/ResourceRequestIOS.mm
    119117platform/network/ios/WebCoreURLResponseIOS.mm
    120 
    121 platform/network/mac/ResourceRequestMac.mm
    122118
    123119platform/text/ios/LocalizedDateCache.mm
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r224826 r224846  
    655655                26B999931803B9D900D01121 /* FunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999921803B9D900D01121 /* FunctionCall.h */; };
    656656                26B999971804D54200D01121 /* SelectorCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999951804D54200D01121 /* SelectorCompiler.h */; };
    657                 26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */; };
    658657                26E944D91AC4B2DD007B85B5 /* CombinedURLFilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E944D51AC4B2DD007B85B5 /* CombinedURLFilters.h */; settings = {ATTRIBUTES = (Private, ); }; };
    659658                26E944DD1AC4B4EA007B85B5 /* Term.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E944DC1AC4B4EA007B85B5 /* Term.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    669668                26F9A83818A046AC00AEB88A /* ViewportConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F9A83618A046AC00AEB88A /* ViewportConfiguration.cpp */; };
    670669                26F9A83918A046AC00AEB88A /* ViewportConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F9A83718A046AC00AEB88A /* ViewportConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
    671                 26FAE4CC1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FAE4C81852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp */; };
    672                 26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */; };
    673670                2914E3081CAB5A440049966F /* AccessibilityAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2914E3061CAB5A440049966F /* AccessibilityAttachment.h */; };
    674671                2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    21382135                7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */; };
    21392136                7EDAAFC919A2CCDC0034DFD1 /* DiskCacheMonitorCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EDAAFC819A2CBD10034DFD1 /* DiskCacheMonitorCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
    2140                 7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */; settings = {ATTRIBUTES = (Private, ); }; };
    21412137                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */; settings = {ATTRIBUTES = (Private, ); }; };
    21422138                7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */; };
    2143                 7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */; };
    21442139                7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845712D26E3800E79415 /* ResourceError.h */; settings = {ATTRIBUTES = (Private, ); }; };
    21452140                7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845A12D26E3800E79415 /* ResourceRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    61276122                26B999941804D54200D01121 /* SelectorCompiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorCompiler.cpp; sourceTree = "<group>"; };
    61286123                26B999951804D54200D01121 /* SelectorCompiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectorCompiler.h; sourceTree = "<group>"; };
    6129                 26C15CF41857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp; sourceTree = "<group>"; };
    6130                 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleCFURLConnectionDelegateWithOperationQueue.h; sourceTree = "<group>"; };
    61316124                26D4E8451B42539D00E033A2 /* DFANode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFANode.cpp; sourceTree = "<group>"; };
    61326125                26E944D41AC4B2DD007B85B5 /* CombinedURLFilters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CombinedURLFilters.cpp; sourceTree = "<group>"; };
     
    61486141                26F9A83618A046AC00AEB88A /* ViewportConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportConfiguration.cpp; sourceTree = "<group>"; };
    61496142                26F9A83718A046AC00AEB88A /* ViewportConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportConfiguration.h; sourceTree = "<group>"; };
    6150                 26FAE4C81852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFURLConnectionDelegate.cpp; sourceTree = "<group>"; };
    6151                 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleCFURLConnectionDelegate.h; sourceTree = "<group>"; };
    61526143                2914E3051CAB5A440049966F /* AccessibilityAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityAttachment.cpp; sourceTree = "<group>"; };
    61536144                2914E3061CAB5A440049966F /* AccessibilityAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityAttachment.h; sourceTree = "<group>"; };
     
    72027193                4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPlugInImageElement.h; sourceTree = "<group>"; };
    72037194                4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
    7204                 442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronousLoaderClientCFNet.cpp; sourceTree = "<group>"; };
    72057195                443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
    72067196                443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
     
    75837573                514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceErrorMac.mm; sourceTree = "<group>"; };
    75847574                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleMac.mm; sourceTree = "<group>"; };
    7585                 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestMac.mm; sourceTree = "<group>"; };
    75867575                514C76580CE923A1007EF3CD /* CredentialBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialBase.cpp; sourceTree = "<group>"; };
    75877576                514C76590CE923A1007EF3CD /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = "<group>"; };
     
    92919280                7D4C96D81AD4483500365A50 /* JSFetchHeaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchHeaders.cpp; sourceTree = "<group>"; };
    92929281                7D4C96D91AD4483500365A50 /* JSFetchHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchHeaders.h; sourceTree = "<group>"; };
    9293                 7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleIOS.mm; sourceTree = "<group>"; };
    92949282                7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESElementIndexUint.cpp; sourceTree = "<group>"; };
    92959283                7E46F6F91627A2C900062223 /* JSOESElementIndexUint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESElementIndexUint.h; sourceTree = "<group>"; };
     
    93149302                7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
    93159303                7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestCocoa.mm; sourceTree = "<group>"; };
    9316                 7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestIOS.mm; sourceTree = "<group>"; };
    93179304                7E8FADC3199A95B100714968 /* SubresourceLoaderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SubresourceLoaderCocoa.mm; sourceTree = "<group>"; };
    93189305                7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFocusAllowedIndicator.cpp; sourceTree = "<group>"; };
     
    93259312                7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
    93269313                7EDAAFC819A2CBD10034DFD1 /* DiskCacheMonitorCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskCacheMonitorCocoa.h; sourceTree = "<group>"; };
    9327                 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationCF.cpp; sourceTree = "<group>"; };
    9328                 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationCF.h; sourceTree = "<group>"; };
    93299314                7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallenge.h; sourceTree = "<group>"; };
    9330                 7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieJarCFNet.cpp; sourceTree = "<group>"; };
    9331                 7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieStorageCFNet.cpp; sourceTree = "<group>"; };
    9332                 7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialStorageCFNet.cpp; sourceTree = "<group>"; };
    93339315                7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataStreamCFNet.cpp; sourceTree = "<group>"; };
    93349316                7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormDataStreamCFNet.h; sourceTree = "<group>"; };
    9335                 7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderRunLoopCF.cpp; sourceTree = "<group>"; };
    9336                 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderRunLoopCF.h; sourceTree = "<group>"; };
    93379317                7EE6845712D26E3800E79415 /* ResourceError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceError.h; sourceTree = "<group>"; };
    9338                 7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceErrorCF.cpp; sourceTree = "<group>"; };
    9339                 7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleCFNet.cpp; sourceTree = "<group>"; };
    93409318                7EE6845A12D26E3800E79415 /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; };
    93419319                7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceRequestCFNet.cpp; sourceTree = "<group>"; };
    93429320                7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequestCFNet.h; sourceTree = "<group>"; };
    93439321                7EE6845D12D26E3800E79415 /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceResponse.h; sourceTree = "<group>"; };
    9344                 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseCFNet.cpp; sourceTree = "<group>"; };
    9345                 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoaderCFNet.cpp; sourceTree = "<group>"; };
    93469322                7F4C96D81AD4483500365A50 /* JSFetchBody.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchBody.cpp; sourceTree = "<group>"; };
    93479323                7F4C96D81AD4483500365A51 /* JSReadableStreamSink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamSink.cpp; sourceTree = "<group>"; };
     
    1652116497                                A1C150771E3F2B3E0032C98C /* PreviewConverter.mm */,
    1652216498                                A10DBF4618F92317000D70C6 /* PreviewLoaderClient.h */,
    16523                                 7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */,
    16524                                 7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */,
    1652516499                                44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */,
    1652616500                                444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */,
     
    1826818242                                514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */,
    1826918243                                514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */,
    18270                                 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */,
    1827118244                                E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */,
    1827218245                                1FAFBF1615A5FA5200083A20 /* UTIUtilities.h */,
     
    1909719070                        );
    1909819071                        path = cocoa;
    19099                         sourceTree = "<group>";
    19100                 };
    19101                 7EE6847312D26E5500E79415 /* cf */ = {
    19102                         isa = PBXGroup;
    19103                         children = (
    19104                                 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,
    19105                         );
    19106                         path = cf;
    1910719072                        sourceTree = "<group>";
    1910819073                };
     
    2288822853                        isa = PBXGroup;
    2288922854                        children = (
    22890                                 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */,
    22891                                 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */,
    2289222855                                7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */,
    2289322856                                5F2DBBE8178E336900141486 /* CertificateInfo.h */,
    22894                                 7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */,
    22895                                 7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */,
    22896                                 7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */,
    2289722857                                B2F34FE80E82F82700F627CD /* DNSCFNet.cpp */,
    2289822858                                7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */,
    2289922859                                7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */,
    22900                                 7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */,
    22901                                 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */,
    2290222860                                E13EF34716850C470034C83F /* NetworkStorageSessionCFNet.cpp */,
    2290322861                                1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */,
    2290422862                                7EE6845712D26E3800E79415 /* ResourceError.h */,
    22905                                 7EE6845812D26E3800E79415 /* ResourceErrorCF.cpp */,
    22906                                 7EE6845912D26E3800E79415 /* ResourceHandleCFNet.cpp */,
    22907                                 26FAE4C81852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp */,
    22908                                 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */,
    22909                                 26C15CF41857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp */,
    22910                                 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */,
    2291122863                                7EE6845A12D26E3800E79415 /* ResourceRequest.h */,
    2291222864                                7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */,
    2291322865                                7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */,
    2291422866                                7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
    22915                                 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
    2291622867                                51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */,
    2291722868                                51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */,
    22918                                 442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */,
    2291922869                        );
    2292022870                        path = cf;
     
    2329023240                                512DD8E80D91E691000F89EE /* archive */,
    2329123241                                A8D2B2521287A56000AF4DDA /* cache */,
    23292                                 7EE6847312D26E5500E79415 /* cf */,
    2329323242                                7E4DE10B198B10810051CB02 /* cocoa */,
    2329423243                                5126E6B60A2E3AEF005C29FA /* icon */,
     
    2612426073                                07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */,
    2612526074                                FD31608B12B026F700C1A359 /* AudioUtilities.h in Headers */,
    26126                                 7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
    2612726075                                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
    2612826076                                934F713A0D5A6F1000018D69 /* AuthenticationChallengeBase.h in Headers */,
     
    2817328121                                9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */,
    2817428122                                656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
    28175                                 7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
    2817628123                                51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */,
    2817728124                                8A12E35D11FA33280025836A /* LoadTiming.h in Headers */,
     
    2881028757                                934F713C0D5A6F1900018D69 /* ResourceErrorBase.h in Headers */,
    2881128758                                514C76790CE923A1007EF3CD /* ResourceHandle.h in Headers */,
    28812                                 26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */,
    28813                                 26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */,
    2881428759                                514C767A0CE923A1007EF3CD /* ResourceHandleClient.h in Headers */,
    2881528760                                514C767B0CE923A1007EF3CD /* ResourceHandleInternal.h in Headers */,
     
    3036330308                                CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
    3036430309                                CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
    30365                                 26FAE4CC1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp in Sources */,
    3036630310                                316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
    3036730311                                BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */,
  • trunk/Source/WebCore/loader/DocumentLoader.h

    r224758 r224846  
    5454#endif
    5555
    56 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     56#if PLATFORM(COCOA)
    5757#include <wtf/SchedulePair.h>
    5858#endif
     
    157157    const String& overrideEncoding() const { return m_overrideEncoding; }
    158158
    159 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     159#if PLATFORM(COCOA)
    160160    void schedule(SchedulePair&);
    161161    void unschedule(SchedulePair&);
  • trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h

    r223981 r224846  
    189189#endif
    190190
    191 #if PLATFORM(WIN) && USE(CFURLCONNECTION)
     191#if USE(CFURLCONNECTION)
    192192    bool shouldCacheResponse(DocumentLoader*, unsigned long, const ResourceResponse&, const unsigned char*, unsigned long long) final { return true; }
    193193#endif
  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r223981 r224846  
    301301#endif
    302302
    303 #if PLATFORM(WIN) && USE(CFURLCONNECTION)
     303#if USE(CFURLCONNECTION)
    304304    // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
    305305    virtual bool shouldCacheResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const unsigned char* data, unsigned long long length) = 0;
  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r224522 r224846  
    763763}
    764764
    765 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     765#if PLATFORM(COCOA)
    766766
    767767void ResourceLoader::schedule(SchedulePair& pair)
  • trunk/Source/WebCore/loader/ResourceLoader.h

    r224522 r224846  
    138138    const LoadTiming& loadTiming() { return m_loadTiming; }
    139139
    140 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     140#if PLATFORM(COCOA)
    141141    void schedule(WTF::SchedulePair&);
    142142    void unschedule(WTF::SchedulePair&);
     
    158158    void didReceiveDataOrBuffer(const char*, unsigned, RefPtr<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
    159159
    160 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     160#if PLATFORM(COCOA)
    161161    NSCachedURLResponse* willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override;
    162 #endif
    163 #if PLATFORM(COCOA) && USE(CFURLCONNECTION)
    164     CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
    165162#endif
    166163
     
    203200    RetainPtr<CFDictionaryRef> connectionProperties(ResourceHandle*) override;
    204201#endif
    205 #if PLATFORM(WIN) && USE(CFURLCONNECTION)
     202#if USE(CFURLCONNECTION)
    206203    // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
    207204    bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
  • trunk/Source/WebCore/loader/SubresourceLoader.h

    r224522 r224846  
    7777    void didRetrieveDerivedDataFromCache(const String& type, SharedBuffer&) override;
    7878
    79 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     79#if PLATFORM(COCOA)
    8080    NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override;
    81 #endif
    82 #if PLATFORM(COCOA) && USE(CFURLCONNECTION)
    83     CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;
    8481#endif
    8582
  • trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp

    r207585 r224846  
    2727#include "ResourceLoader.h"
    2828
    29 #if USE(CFURLCONNECTION)
    30 
    3129#include "FrameLoader.h"
    3230#include "FrameLoaderClient.h"
     
    3432namespace WebCore {
    3533
    36 #if PLATFORM(WIN)
     34#if PLATFORM(WIN) && USE(CFURLCONNECTION)
    3735
    3836bool ResourceLoader::shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef cachedResponse)
     
    4947
    5048} // namespace WebCore
    51 
    52 #endif // USE(CFURLCONNECTION)
  • trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm

    r220243 r224846  
    3636namespace WebCore {
    3737
    38 #if USE(CFURLCONNECTION)
    39 
    40 CFCachedURLResponseRef SubresourceLoader::willCacheResponse(ResourceHandle* handle, CFCachedURLResponseRef cachedResponse)
    41 {
    42     DiskCacheMonitor::monitorFileBackingStoreCreation(request(), m_resource->sessionID(), cachedResponse);
    43     if (!m_resource->shouldCacheResponse(CFCachedURLResponseGetWrappedResponse(cachedResponse)))
    44         return nullptr;
    45     return ResourceLoader::willCacheResponse(handle, cachedResponse);
    46 }
    47 
    48 #else
    49 
    5038NSCachedURLResponse* SubresourceLoader::willCacheResponse(ResourceHandle* handle, NSCachedURLResponse* response)
    5139{
     
    5644}
    5745
    58 #endif
    59 
    6046}
  • trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp

    r223149 r224846  
    3434namespace WebCore {
    3535
    36 #if !USE(CFURLCONNECTION)
    37 
    3836static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
    3937{
     
    6664}
    6765
    68 #endif
    69 
    7066} // namespace WebCore
  • trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm

    r220243 r224846  
    3232#include "FrameLoader.h"
    3333#include "FrameLoaderClient.h"
    34 #include "SharedBuffer.h"
    35 #include <pal/spi/cf/CFNetworkSPI.h>
    3634
    3735namespace WebCore {
    38 
    39 #if USE(CFURLCONNECTION)
    40 
    41 CFCachedURLResponseRef ResourceLoader::willCacheResponse(ResourceHandle*, CFCachedURLResponseRef cachedResponse)
    42 {
    43     if (m_options.sendLoadCallbacks == DoNotSendCallbacks)
    44         return nullptr;
    45 
    46     RetainPtr<NSCachedURLResponse> nsCachedResponse = adoptNS([[NSCachedURLResponse alloc] _initWithCFCachedURLResponse:cachedResponse]);
    47     return [frameLoader()->client().willCacheResponse(documentLoader(), identifier(), nsCachedResponse.get()) _CFCachedURLResponse];
    48 }
    49 
    50 #else
    5136
    5237NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCachedURLResponse* response)
     
    5742}
    5843
    59 #endif
    60 
    6144}
  • trunk/Source/WebCore/page/mac/PageMac.mm

    r223206 r224846  
    4747{
    4848#if PLATFORM(IOS)
    49 #if USE(CFURLCONNECTION)
    50     addSchedulePair(SchedulePair::create(WebThreadRunLoop(), kCFRunLoopCommonModes));
     49    addSchedulePair(SchedulePair::create(WebThreadNSRunLoop(), kCFRunLoopCommonModes));
    5150#else
    52     addSchedulePair(SchedulePair::create(WebThreadNSRunLoop(), kCFRunLoopCommonModes));
    53 #endif // USE(CFURLCONNECTION)
    54 #else
    55 #if USE(CFURLCONNECTION)
    5651    addSchedulePair(SchedulePair::create([[NSRunLoop currentRunLoop] getCFRunLoop], kCFRunLoopCommonModes));
    57 #else
    58     addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));
    59 #endif
    6052#endif
    6153
     
    7567    m_scheduledRunLoopPairs->add(pair.ptr());
    7668
    77 #if !USE(CFURLCONNECTION)
    7869    for (Frame* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
    7970        if (DocumentLoader* documentLoader = frame->loader().documentLoader())
     
    8273            documentLoader->schedule(pair);
    8374    }
    84 #endif
    8575
    8676    // FIXME: make SharedTimerMac use these SchedulePairs.
     
    9585    m_scheduledRunLoopPairs->remove(pair.ptr());
    9686
    97 #if !USE(CFURLCONNECTION)
    9887    for (Frame* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
    9988        if (DocumentLoader* documentLoader = frame->loader().documentLoader())
     
    10291            documentLoader->unschedule(pair);
    10392    }
    104 #endif
    10593}
    10694
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r224574 r224846  
    117117#endif
    118118
    119 #if USE(CFURLCONNECTION)
    120 #include <pal/spi/cocoa/CFNSURLConnectionSPI.h>
    121 #endif
    122 
    123119#import "CoreVideoSoftLink.h"
    124120#import "MediaRemoteSoftLink.h"
     
    391387    return globalQueue;
    392388}
    393 #endif
    394 
    395 #if USE(CFURLCONNECTION)
    396 class WebCoreNSURLAuthenticationChallengeClient : public RefCounted<WebCoreNSURLAuthenticationChallengeClient>, public AuthenticationClient {
    397 public:
    398     static RefPtr<WebCoreNSURLAuthenticationChallengeClient> create(NSURLAuthenticationChallenge *challenge)
    399     {
    400         return adoptRef(new WebCoreNSURLAuthenticationChallengeClient(challenge));
    401     }
    402 
    403     using RefCounted<WebCoreNSURLAuthenticationChallengeClient>::ref;
    404     using RefCounted<WebCoreNSURLAuthenticationChallengeClient>::deref;
    405 
    406 private:
    407     WebCoreNSURLAuthenticationChallengeClient(NSURLAuthenticationChallenge *challenge)
    408         : m_challenge(challenge)
    409     {
    410         ASSERT(m_challenge);
    411     }
    412 
    413     void refAuthenticationClient() override { ref(); }
    414     void derefAuthenticationClient() override { deref(); }
    415 
    416     void receivedCredential(const AuthenticationChallenge&, const Credential& credential) override
    417     {
    418         [[m_challenge sender] useCredential:credential.nsCredential() forAuthenticationChallenge:m_challenge.get()];
    419     }
    420 
    421     void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&) override
    422     {
    423         [[m_challenge sender] continueWithoutCredentialForAuthenticationChallenge:m_challenge.get()];
    424     }
    425 
    426     void receivedCancellation(const AuthenticationChallenge&) override
    427     {
    428         [[m_challenge sender] cancelAuthenticationChallenge:m_challenge.get()];
    429     }
    430 
    431     void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&) override
    432     {
    433         if ([[m_challenge sender] respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)])
    434             [[m_challenge sender] performDefaultHandlingForAuthenticationChallenge:m_challenge.get()];
    435     }
    436 
    437     void receivedChallengeRejection(const AuthenticationChallenge&) override
    438     {
    439         if ([[m_challenge sender] respondsToSelector:@selector(rejectProtectionSpaceAndContinueWithChallenge:)])
    440             [[m_challenge sender] rejectProtectionSpaceAndContinueWithChallenge:m_challenge.get()];
    441     }
    442 
    443     RetainPtr<NSURLAuthenticationChallenge> m_challenge;
    444 };
    445389#endif
    446390
     
    18701814}
    18711815
    1872 bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge* nsChallenge)
    1873 {
    1874 #if USE(CFURLCONNECTION)
    1875     RefPtr<WebCoreNSURLAuthenticationChallengeClient> client = WebCoreNSURLAuthenticationChallengeClient::create(nsChallenge);
    1876     RetainPtr<CFURLAuthChallengeRef> cfChallenge = adoptCF([nsChallenge _createCFAuthChallenge]);
    1877     AuthenticationChallenge challenge(cfChallenge.get(), client.get());
    1878 #else
    1879     AuthenticationChallenge challenge(nsChallenge);
    1880 #endif
    1881 
     1816bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge* challenge)
     1817{
    18821818    return player()->shouldWaitForResponseToAuthenticationChallenge(challenge);
    18831819}
  • trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp

    r207585 r224846  
    2828#include "ProtectionSpace.h"
    2929
    30 #if USE(CFURLCONNECTION) && !PLATFORM(COCOA)
     30#if USE(CFURLCONNECTION)
    3131#include "AuthenticationCF.h"
    3232#include <CFNetwork/CFURLProtectionSpacePriv.h>
     
    119119}
    120120
    121 
    122121bool ProtectionSpaceBase::compare(const ProtectionSpace& a, const ProtectionSpace& b)
    123122{
  • trunk/Source/WebCore/platform/network/ResourceHandle.h

    r224373 r224846  
    126126#endif
    127127
    128 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     128#if PLATFORM(COCOA)
    129129    WEBCORE_EXPORT NSURLConnection *connection() const;
    130130    id makeDelegate(bool, WTF::MessageQueue<WTF::Function<void()>>*);
     
    206206    WEBCORE_EXPORT void continueWillCacheResponse(CFCachedURLResponseRef);
    207207#endif
    208 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     208#if PLATFORM(COCOA)
    209209    WEBCORE_EXPORT void continueWillCacheResponse(NSCachedURLResponse *);
    210210#endif
     
    224224#if PLATFORM(COCOA) || USE(CFURLCONNECTION)
    225225    WEBCORE_EXPORT static CFStringRef synchronousLoadRunLoopMode();
    226 #endif
    227 
    228 #if PLATFORM(IOS) && USE(CFURLCONNECTION)
    229     static CFMutableDictionaryRef createSSLPropertiesFromNSURLRequest(const ResourceRequest&);
    230226#endif
    231227
     
    270266#endif
    271267
    272 #if PLATFORM(MAC) && !USE(CFURLCONNECTION)
     268#if PLATFORM(MAC)
    273269    void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, SchedulingBehavior);
    274270#endif
    275271
    276 #if PLATFORM(IOS) && !USE(CFURLCONNECTION)
     272#if PLATFORM(IOS)
    277273    void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, SchedulingBehavior, NSDictionary *connectionProperties);
    278274#endif
  • trunk/Source/WebCore/platform/network/ResourceHandleInternal.h

    r224395 r224846  
    122122    RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
    123123#endif
    124 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
     124#if PLATFORM(COCOA)
    125125    RetainPtr<NSURLConnection> m_connection;
    126126    RetainPtr<id> m_delegate;
  • trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp

    r210890 r224846  
    4545
    4646AuthenticationChallenge::AuthenticationChallenge(CFURLAuthChallengeRef cfChallenge, AuthenticationClient* authenticationClient)
    47 #if PLATFORM(COCOA)
    48     : AuthenticationChallengeBase(ProtectionSpace(CFURLAuthChallengeGetProtectionSpace(cfChallenge)), Credential(CFURLAuthChallengeGetProposedCredential(cfChallenge)),
    49 #else
    5047    : AuthenticationChallengeBase(core(CFURLAuthChallengeGetProtectionSpace(cfChallenge)), core(CFURLAuthChallengeGetProposedCredential(cfChallenge)),
    51 #endif
    5248        CFURLAuthChallengeGetPreviousFailureCount(cfChallenge), (CFURLResponseRef)CFURLAuthChallengeGetFailureResponse(cfChallenge), CFURLAuthChallengeGetError(cfChallenge))
    5349    , m_authenticationClient(authenticationClient)
     
    8177    // FIXME: Why not cache CFURLAuthChallengeRef in m_cfChallenge? Foundation counterpart does that.
    8278
    83 #if PLATFORM(COCOA)
    84     CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, coreChallenge.protectionSpace().cfSpace(), coreChallenge.proposedCredential().cfCredential(),
    85 #else
    8679    RetainPtr<CFURLCredentialRef> credential = adoptCF(createCF(coreChallenge.proposedCredential()));
    8780    RetainPtr<CFURLProtectionSpaceRef> protectionSpace = adoptCF(createCF(coreChallenge.protectionSpace()));
    88     CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, protectionSpace.get(), credential.get(),
    89 #endif
    90                                         coreChallenge.previousFailureCount(),
    91                                         coreChallenge.failureResponse().cfURLResponse(),
    92                                         coreChallenge.error());
     81    CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, protectionSpace.get(), credential.get(), coreChallenge.previousFailureCount(), coreChallenge.failureResponse().cfURLResponse(), coreChallenge.error());
    9382    return result;
    9483}
    9584
    96 #if !PLATFORM(COCOA)
    9785CFURLCredentialRef createCF(const Credential& coreCredential)
    9886{
     
    276264                           scheme);
    277265}
    278 #endif
    279266
    280267}
  • trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h

    r207585 r224846  
    4040
    4141CFURLAuthChallengeRef createCF(const AuthenticationChallenge&);
    42 #if PLATFORM(WIN)
    4342CFURLCredentialRef createCF(const Credential&);
    4443CFURLProtectionSpaceRef createCF(const ProtectionSpace&);
    45 #endif
    46 
    47 #if PLATFORM(COCOA)
    48 AuthenticationChallenge core(CFURLAuthChallengeRef);
    49 #endif
    50 #if PLATFORM(WIN)
    5144Credential core(CFURLCredentialRef);
    5245ProtectionSpace core(CFURLProtectionSpaceRef);
    53 #endif
    5446}
    5547
  • trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp

    r224267 r224846  
    3636#include <CFNetwork/CFHTTPCookiesPriv.h>
    3737#include <CoreFoundation/CoreFoundation.h>
     38#include <WebKitSystemInterface/WebKitSystemInterface.h>
    3839#include <pal/spi/cf/CFNetworkSPI.h>
     40#include <windows.h>
    3941#include <wtf/SoftLinking.h>
    4042#include <wtf/cf/TypeCastsCF.h>
    4143#include <wtf/text/WTFString.h>
    4244
    43 #if PLATFORM(WIN)
    44 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    45 #include <windows.h>
    46 #endif
    47 
    48 #if PLATFORM(WIN)
    4945enum {
    5046    CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
    5147};
    52 #endif
    5348
    5449namespace WTF {
     
    131126    ASSERT(!secure || (secure && url.protocolIs("https")));
    132127
    133 #if PLATFORM(COCOA)
    134     return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
    135 #else
    136     // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
    137128    UNUSED_PARAM(firstParty);
    138129    return adoptCF(CFHTTPCookieStorageCopyCookiesForURL(session.cookieStorage().get(), url.createCFURL().get(), secure));
    139 #endif
    140130}
    141131
    142132static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
    143133{
    144 #if PLATFORM(IOS)
    145     CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
    146 #else
    147134    CFArrayRef parsedCookies = CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
    148 #endif
    149135    if (!parsedCookies)
    150136        parsedCookies = CFArrayCreate(kCFAllocatorDefault, 0, 0, &kCFTypeArrayCallBacks);
     
    289275}
    290276
    291 #if PLATFORM(WIN)
    292277void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
    293278{
     
    297282{
    298283}
    299 #endif
    300284
    301285} // namespace WebCore
  • trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp

    r222898 r224846  
    2727#include "CookieStorage.h"
    2828
     29#include "LoaderRunLoopCF.h"
    2930#include "NetworkStorageSession.h"
     31#include <CFNetwork/CFHTTPCookiesPriv.h>
     32#include <WebKitSystemInterface/WebKitSystemInterface.h>
    3033#include <wtf/Function.h>
    3134#include <wtf/HashMap.h>
     
    3336#include <wtf/NeverDestroyed.h>
    3437
    35 #if PLATFORM(WIN)
    36 #include "LoaderRunLoopCF.h"
    37 #include <CFNetwork/CFHTTPCookiesPriv.h>
    38 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    39 #endif
    40 
    4138namespace WebCore {
    42 
    43 #if PLATFORM(WIN)
    4439
    4540static HashMap<CFHTTPCookieStorageRef, WTF::Function<void ()>>& cookieChangeCallbackMap()
     
    10297}
    10398
    104 #endif // PLATFORM(WIN)
    105 
    10699} // namespace WebCore
  • trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp

    r222898 r224846  
    3232#include "Credential.h"
    3333#include "ProtectionSpace.h"
     34#include <WebKitSystemInterface/WebKitSystemInterface.h>
    3435#include <pal/spi/cf/CFNetworkSPI.h>
    3536#include <wtf/RetainPtr.h>
    36 
    37 #if PLATFORM(WIN)
    38 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    39 #endif
    40 
    41 #if PLATFORM(IOS)
    42 #include <CFNetwork/CFURLCredentialStorage.h>
    43 #endif
    4437
    4538namespace WebCore {
     
    5346Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
    5447{
    55 #if PLATFORM(COCOA)
    56     auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpace.cfSpace()));
    57     return Credential(credentialCF.get());
    58 #else
    5948    auto protectionSpaceCF = adoptCF(createCF(protectionSpace));
    6049    auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpaceCF.get()));
    6150    return core(credentialCF.get());
    62 #endif
    6351}
    6452
  • trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp

    r207585 r224846  
    3232#include <CoreFoundation/CFError.h>
    3333#include <CFNetwork/CFNetworkErrors.h>
     34#include <WebKitSystemInterface/WebKitSystemInterface.h>
    3435#include <wtf/RetainPtr.h>
    35 
    36 #if PLATFORM(WIN)
    37 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    38 #endif
    3936
    4037namespace WebCore {
     
    4946}
    5047
    51 #if PLATFORM(WIN)
    5248ResourceError::ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate)
    5349    : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription, Type::General)
     
    6965    m_certificate = certificate;
    7066}
    71 #endif // PLATFORM(WIN)
    7267
    7368const CFStringRef failingURLStringKey = CFSTR("NSErrorFailingURLStringKey");
     
    112107        m_localizedDescription = (CFStringRef) CFDictionaryGetValue(userInfo.get(), kCFErrorLocalizedDescriptionKey);
    113108       
    114 #if PLATFORM(WIN)
    115109        m_certificate = wkGetSSLPeerCertificateData(userInfo.get());
    116 #endif
    117110    }
    118111
     
    123116void ResourceError::doPlatformIsolatedCopy(const ResourceError& other)
    124117{
    125 #if PLATFORM(WIN)
    126118    m_certificate = other.m_certificate;
    127 #else
    128     UNUSED_PARAM(other);
    129 #endif
    130119}
    131120
     
    155144        }
    156145
    157 #if PLATFORM(WIN)
    158146        if (m_certificate)
    159147            wkSetSSLPeerCertificateData(userInfo.get(), m_certificate.get());
    160 #endif
    161148       
    162149        m_platformError = adoptCF(CFErrorCreate(0, m_domain.createCFString().get(), m_errorCode, userInfo.get()));
  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r224373 r224846  
    5757#include <wtf/text/CString.h>
    5858
    59 #if PLATFORM(COCOA)
    60 #include "ResourceHandleCFURLConnectionDelegateWithOperationQueue.h"
    61 #if USE(CFURLCONNECTION)
    62 #include "WebCoreURLResponse.h"
    63 #include <CFNetwork/CFURLConnectionPriv.h>
    64 #include <CFNetwork/CFURLRequestPriv.h>
    65 #endif
    66 #endif
    67 
    6859#if PLATFORM(WIN)
    6960#include <WebKitSystemInterface/WebKitSystemInterface.h>
  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp

    r223728 r224846  
    3232#include "NetworkingContext.h"
    3333#include "ResourceHandle.h"
     34#include <WebKitSystemInterface/WebKitSystemInterface.h>
    3435#include <pal/spi/cf/CFNetworkSPI.h>
    35 
    36 #if PLATFORM(WIN)
    37 #include <WebKitSystemInterface/WebKitSystemInterface.h>
    38 #endif
    3936
    4037namespace WebCore {
  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp

    r224373 r224846  
    7474void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef request)
    7575{
    76 #if PLATFORM(IOS)
    77     CFURLRequestSetShouldStartSynchronously(request, 1);
    78 #endif
    7976    CFURLRef requestURL = CFURLRequestGetURL(request);
    8077    if (!requestURL)
     
    8380}
    8481
    85 #if PLATFORM(WIN)
    8682LRESULT CALLBACK hookToRemoveCFNetworkMessage(int code, WPARAM wParam, LPARAM lParam)
    8783{
     
    10197    }
    10298}
    103 #endif
    10499
    105100static void emptyPerform(void*)
     
    133128void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling(CFURLConnectionRef connection)
    134129{
    135 #if PLATFORM(WIN)
    136130    installHookToRemoveCFNetworkMessageBlockingMainThread();
    137 #endif
    138131    CFRunLoopRef runLoop = getRunLoop();
    139132    CFURLConnectionScheduleWithRunLoop(connection, runLoop, kCFRunLoopDefaultMode);
     
    202195        if (statusCode != 304) {
    203196            bool isMainResourceLoad = handle->firstRequest().requester() == ResourceRequest::Requester::Main;
    204 #if !PLATFORM(WIN)
    205             adjustMIMETypeIfNecessary(cfResponse.get(), isMainResourceLoad);
    206 #endif
    207         }
    208 
    209 #if !PLATFORM(IOS)
     197        }
     198
    210199        if (_CFURLRequestCopyProtocolPropertyForKey(handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
    211200            CFURLResponseSetMIMEType(cfResponse.get(), CFSTR("text/html"));
    212 #endif // !PLATFORM(IOS)
    213201
    214202        ResourceResponse resourceResponse(cfResponse.get());
    215203        resourceResponse.setSource(ResourceResponse::Source::Network);
    216 #if !PLATFORM(WIN)
    217         ResourceHandle::getConnectionTimingData(connection.get(), resourceResponse.deprecatedNetworkLoadMetrics());
    218 #endif
    219 
    220204        handle->didReceiveResponse(WTFMove(resourceResponse));
    221205    };
     
    298282CFCachedURLResponseRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse(CFCachedURLResponseRef cachedResponse)
    299283{
    300 #if PLATFORM(WIN)
    301284    // Workaround for <rdar://problem/6300990> Caching does not respect Vary HTTP header.
    302285    // FIXME: WebCore cache has issues with Vary, too (bug 58797, bug 71509).
     
    308291            return nullptr;
    309292    }
    310 #endif // PLATFORM(WIN)
    311293
    312294    auto work = [protectedThis = makeRef(*this), cachedResponse = RetainPtr<CFCachedURLResponseRef>(cachedResponse)] () {
     
    386368
    387369        ProtectionSpace coreProtectionSpace = ProtectionSpace(protectionSpace.get());
    388 #if PLATFORM(IOS)
    389         if (coreProtectionSpace.authenticationScheme() == ProtectionSpaceAuthenticationSchemeUnknown) {
    390             m_boolResult = false;
    391             dispatch_semaphore_signal(m_semaphore);
    392             return;
    393         }
    394 #endif // PLATFORM(IOS)
    395370        handle->canAuthenticateAgainstProtectionSpace(coreProtectionSpace);
    396371    };
  • trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp

    r222898 r224846  
    4444{
    4545    if (!m_cfResponse && !m_isNull) {
    46 #if PLATFORM(COCOA)
    47         nsURLResponse();
    48 #else
    4946        RetainPtr<CFURLRef> url = m_url.createCFURL();
    5047        // FIXME: This creates a very incomplete CFURLResponse, which does not even have a status code.
    5148        m_cfResponse = adoptCF(CFURLResponseCreate(0, url.get(), m_mimeType.string().createCFString().get(), m_expectedContentLength, m_textEncodingName.string().createCFString().get(), kCFURLCacheStorageAllowed));
    52 #endif
    5349    }
    5450
     
    113109}
    114110
    115 #if !PLATFORM(COCOA)
    116111CertificateInfo ResourceResponse::platformCertificateInfo() const
    117112{
    118113    return { };
    119114}
    120 #endif
    121115
    122116String ResourceResponse::platformSuggestedFilename() const
  • trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm

    r207585 r224846  
    2626#import "config.h"
    2727#import "CredentialCocoa.h"
    28 
    29 #if USE(CFURLCONNECTION)
    30 @interface NSURLCredential (WebDetails)
    31 - (id)_initWithCFURLCredential:(CFURLCredentialRef)credential;
    32 - (CFURLCredentialRef) _CFURLCredential;
    33 @end
    34 #endif
    3528
    3629namespace WebCore {
     
    8578}
    8679
    87 #if USE(CFURLCONNECTION)
    88 Credential::Credential(CFURLCredentialRef credential)
    89     : Credential(adoptNS([[NSURLCredential alloc] _initWithCFURLCredential:credential]).get())
    90 {
    91 }
    92 #endif
    93 
    9480Credential::Credential(NSURLCredential *credential)
    9581    : CredentialBase(credential.user, credential.password, toCredentialPersistence(credential.persistence))
     
    9783{
    9884}
    99 
    100 #if USE(CFURLCONNECTION)
    101 CFURLCredentialRef Credential::cfCredential() const
    102 {
    103     return [nsCredential() _CFURLCredential];
    104 }
    105 #endif
    10685
    10786NSURLCredential *Credential::nsCredential() const
  • trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm

    r207585 r224846  
    2727#import "ProtectionSpaceCocoa.h"
    2828
    29 #if USE(CFURLCONNECTION)
    30 @interface NSURLProtectionSpace (WebDetails)
    31 - (CFURLProtectionSpaceRef) _CFURLProtectionSpace;
    32 - (id)_initWithCFURLProtectionSpace:(CFURLProtectionSpaceRef)cfProtSpace;
    33 @end
    34 #endif
    35 
    3629namespace WebCore {
    37 
    38 #if USE(CFURLCONNECTION)
    39 ProtectionSpace::ProtectionSpace(CFURLProtectionSpaceRef space)
    40     : ProtectionSpace(adoptNS([[NSURLProtectionSpace alloc] _initWithCFURLProtectionSpace:space]).get())
    41 {
    42 }
    43 #endif
    4430
    4531static ProtectionSpaceServerType type(NSURLProtectionSpace *space)
     
    10591    m_nsSpace = space;
    10692}
    107 
    108 #if USE(CFURLCONNECTION)
    109 CFURLProtectionSpaceRef ProtectionSpace::cfSpace() const
    110 {
    111     return [nsSpace() _CFURLProtectionSpace];
    112 }
    113 #endif
    11493
    11594NSURLProtectionSpace *ProtectionSpace::nsSpace() const
  • trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm

    r224371 r224846  
    4343{
    4444    updatePlatformRequest(bodyPolicy);
    45 #if USE(CFURLCONNECTION)
    46     if (!m_nsRequest)
    47         const_cast<ResourceRequest*>(this)->updateNSURLRequest();
    48 #endif
    4945    return [[m_nsRequest.get() retain] autorelease];
    5046}
    51 
    52 #if USE(CFURLCONNECTION)
    53 
    54 void ResourceRequest::clearOrUpdateNSURLRequest()
    55 {
    56     // There is client code that extends NSURLRequest and expects to get back, in the delegate
    57     // callbacks, an object of the same type that they passed into WebKit. To keep then running, we
    58     // create an object of the same type and return that. See <rdar://9843582>.
    59     // Also, developers really really want an NSMutableURLRequest so try to create an
    60     // NSMutableURLRequest instead of NSURLRequest.
    61     static Class nsURLRequestClass = [NSURLRequest class];
    62     static Class nsMutableURLRequestClass = [NSMutableURLRequest class];
    63     Class requestClass = [m_nsRequest.get() class];
    64    
    65     if (!m_cfRequest)
    66         return;
    67    
    68     if (requestClass && requestClass != nsURLRequestClass && requestClass != nsMutableURLRequestClass)
    69         m_nsRequest = adoptNS([[requestClass alloc] _initWithCFURLRequest:m_cfRequest.get()]);
    70     else
    71         m_nsRequest = nullptr;
    72 }
    73 
    74 #else
    7547
    7648CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
     
    263235}
    264236
    265 #endif // USE(CFURLCONNECTION)
    266 
    267237NSURLRequest *copyRequestWithStorageSession(CFURLStorageSessionRef storageSession, NSURLRequest *request)
    268238{
  • trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm

    r224644 r224846  
    7676CertificateInfo ResourceResponse::platformCertificateInfo() const
    7777{
    78 #if USE(CFURLCONNECTION)
    79     ASSERT(m_cfResponse || source() == Source::ServiceWorker);
    80     CFURLResponseRef cfResponse = m_cfResponse.get();
    81 #else
    8278    ASSERT(m_nsResponse || source() == Source::ServiceWorker);
    8379    CFURLResponseRef cfResponse = [m_nsResponse _CFURLResponse];
    84 #endif
    8580
    8681    if (!cfResponse)
     
    114109#endif
    115110}
    116 
    117 #if USE(CFURLCONNECTION)
    118 
    119 NSURLResponse *ResourceResponse::nsURLResponse() const
    120 {
    121     if (!m_nsResponse && !m_cfResponse && !m_isNull) {
    122         initNSURLResponse();
    123         m_cfResponse = [m_nsResponse.get() _CFURLResponse];
    124         return m_nsResponse.get();
    125     }
    126 
    127     if (!m_cfResponse)
    128         return nil;
    129 
    130     if (!m_nsResponse)
    131         m_nsResponse = [NSURLResponse _responseWithCFURLResponse:m_cfResponse.get()];
    132 
    133     return m_nsResponse.get();
    134 }
    135 
    136 ResourceResponse::ResourceResponse(NSURLResponse* nsResponse)
    137     : m_initLevel(Uninitialized)
    138     , m_cfResponse([nsResponse _CFURLResponse])
    139     , m_nsResponse(nsResponse)
    140 {
    141     m_isNull = !nsResponse;
    142 }
    143 
    144 #else
    145111
    146112static NSString* const commonHeaderFields[] = {
     
    243209}
    244210
    245 #endif // USE(CFURLCONNECTION)
    246 
    247211} // namespace WebCore
    248212
  • trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm

    r220506 r224846  
    2626#import "AuthenticationMac.h"
    2727
    28 #import "AuthenticationCF.h"
    2928#import "AuthenticationChallenge.h"
    3029#import "AuthenticationClient.h"
     
    3332#import <Foundation/NSURLProtectionSpace.h>
    3433
    35 #if USE(CFURLCONNECTION)
    36 #import <pal/spi/cocoa/CFNSURLConnectionSPI.h>
    37 #endif
    38 
    3934using namespace WebCore;
    4035
     
    4237{
    4338    AuthenticationClient* m_client;
    44 #if USE(CFURLCONNECTION)
    45     CFURLAuthChallengeRef m_cfChallenge;
    46 #endif
    4739}
    4840- (id)initWithAuthenticationClient:(AuthenticationClient*)client;
     
    10294}
    10395
    104 #if USE(CFURLCONNECTION)
    105 - (void)setCFChallenge:(CFURLAuthChallengeRef)challenge
    106 {
    107     m_cfChallenge = challenge;
    108 }
    109 
    110 - (CFURLAuthChallengeRef)cfChallenge
    111 {
    112     return m_cfChallenge;
    113 }
    114 #endif
    115 
    11696@end
    11797
    11898namespace WebCore {
    119 
    120 #if USE(CFURLCONNECTION)
    121 
    122 AuthenticationChallenge core(NSURLAuthenticationChallenge *macChallenge)
    123 {
    124     WebCoreAuthenticationClientAsChallengeSender *challengeSender = (WebCoreAuthenticationClientAsChallengeSender*) [macChallenge sender];
    125     return AuthenticationChallenge([challengeSender cfChallenge], [challengeSender client]);
    126 }
    127 
    128 NSURLAuthenticationChallenge *mac(const AuthenticationChallenge& coreChallenge)
    129 {
    130     AuthenticationClient* authClient = coreChallenge.authenticationClient();
    131     RetainPtr<WebCoreAuthenticationClientAsChallengeSender> challengeSender = adoptNS([[WebCoreAuthenticationClientAsChallengeSender alloc] initWithAuthenticationClient:authClient]);
    132     RetainPtr<CFURLAuthChallengeRef> authChallenge = coreChallenge.cfURLAuthChallengeRef();
    133     if (!authChallenge)
    134         authChallenge = adoptCF(createCF(coreChallenge));
    135     [challengeSender.get() setCFChallenge:authChallenge.get()];
    136 #if PLATFORM(IOS)
    137     return [[NSURLAuthenticationChallenge _createAuthenticationChallengeForCFAuthChallenge:authChallenge.get() sender:challengeSender.get()] autorelease];
    138 #else
    139     return [[NSURLAuthenticationChallenge _authenticationChallengeForCFAuthChallenge:authChallenge.get() sender:challengeSender.get()] autorelease];
    140 #endif
    141 }
    142 
    143 #else
    14499
    145100AuthenticationChallenge::AuthenticationChallenge(const ProtectionSpace& protectionSpace,
     
    184139        return [static_cast<WebCoreAuthenticationClientAsChallengeSender*>(m_sender.get()) client];
    185140   
    186     return 0;
     141    return nullptr;
    187142}
    188143
     
    203158        return coreChallenge.nsURLAuthenticationChallenge();
    204159       
    205     return [[[NSURLAuthenticationChallenge alloc] initWithProtectionSpace:coreChallenge.protectionSpace().nsSpace()
    206                                                        proposedCredential:coreChallenge.proposedCredential().nsCredential()
    207                                                      previousFailureCount:coreChallenge.previousFailureCount()
    208                                                           failureResponse:coreChallenge.failureResponse().nsURLResponse()
    209                                                                     error:coreChallenge.error()
    210                                                                    sender:coreChallenge.sender()] autorelease];
     160    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];
    211161}
    212162
     
    216166}
    217167
    218 #endif // USE(CFURLCONNECTION)
    219 
    220168} // namespace WebCore
  • trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm

    r224267 r224846  
    3232#import <wtf/BlockObjCExceptions.h>
    3333
    34 #if !USE(CFURLCONNECTION)
    35 
    3634#import "Cookie.h"
    3735#import "CookieStorage.h"
     
    4442@end
    4543
    46 #endif
    47 
    4844namespace WebCore {
    4945
     
    6662    CFHTTPCookieStorageDeleteCookie(cookieStorage, [cookie _GetInternalCFHTTPCookie]);
    6763}
    68 
    69 #if !USE(CFURLCONNECTION)
    7064
    7165static NSArray *httpCookiesForURL(CFHTTPCookieStorageRef cookieStorage, NSURL *firstParty, NSURL *url)
     
    349343}
    350344
    351 #endif // !USE(CFURLCONNECTION)
    352 
    353345void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames)
    354346{
  • trunk/Source/WebCore/platform/network/mac/CredentialStorageMac.mm

    r213125 r224846  
    2727#include "CredentialStorage.h"
    2828
    29 #if !USE(CFURLCONNECTION)
    30 
    3129#include "AuthenticationMac.h"
    3230#include "Credential.h"
     
    4240
    4341} // namespace WebCore
    44 
    45 #endif // !USE(CFURLCONNECTION)
  • trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.h

    r218517 r224846  
    2929#pragma once
    3030
    31 #if !USE(CFURLCONNECTION)
    32 
    3331#include <wtf/Forward.h>
    3432#include <wtf/RetainPtr.h>
     
    4846
    4947} // namespace WebCore
    50 
    51 #endif // !USE(CFURLCONNECTION)
  • trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.mm

    r220243 r224846  
    3030#import "FormDataStreamMac.h"
    3131
    32 #if !USE(CFURLCONNECTION)
    33 
    3432#import "FormDataStreamCFNet.h"
    3533#import <pal/spi/cf/CFNetworkSPI.h>
     
    5351
    5452} // namespace WebCore
    55 
    56 #endif // !USE(CFURLCONNECTION)
  • trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm

    r224395 r224846  
    3131#import <Foundation/Foundation.h>
    3232#import <wtf/BlockObjCExceptions.h>
    33 
    34 #if PLATFORM(IOS) && USE(CFURLCONNECTION) && USE(APPLE_INTERNAL_SDK)
    35 #import <CFNetwork/CFSocketStreamPriv.h>
    36 #endif
    37 
    38 #if USE(CFURLCONNECTION)
    39 extern "C" {
    40 const CFStringRef _kCFStreamPropertySSLClientCertificates;
    41 const CFStringRef _kCFStreamPropertySSLClientCertificateState;
    42 }
    43 #endif
    4433
    4534@interface NSError (WebExtras)
     
    9988@end
    10089
    101 
    102 #if USE(CFURLCONNECTION)
    103 static NSError *NSErrorFromCFError(CFErrorRef cfError, NSURL *url)
    104 {
    105     CFIndex errCode = CFErrorGetCode(cfError);
    106     if (CFEqual(CFErrorGetDomain(cfError), kCFErrorDomainCFNetwork) && errCode <= kCFURLErrorUnknown && errCode > -4000) {
    107         // This is an URL error and needs to be translated to the NSURLErrorDomain
    108         id keys[10], values[10];
    109         CFDictionaryRef userInfo = CFErrorCopyUserInfo(cfError);
    110         NSError *result;
    111         NSInteger count = 0;
    112 
    113         if (url) {
    114             keys[count] = NSURLErrorFailingURLErrorKey;
    115             values[count] = url;
    116             count++;
    117 
    118             keys[count] = NSURLErrorFailingURLStringErrorKey;
    119             values[count] = [url absoluteString];
    120             count++;
    121         }
    122 
    123         values[count] = (id)CFDictionaryGetValue(userInfo, kCFErrorLocalizedDescriptionKey);
    124         if (values[count]) {
    125             keys[count] = NSLocalizedDescriptionKey;
    126             count++;
    127         }
    128 
    129         values[count] = (id)CFDictionaryGetValue(userInfo, kCFErrorLocalizedFailureReasonKey);
    130         if (values[count]) {
    131             keys[count] = NSLocalizedFailureReasonErrorKey;
    132             count++;
    133         }
    134 
    135         values[count] = (id)CFDictionaryGetValue(userInfo, kCFErrorLocalizedRecoverySuggestionKey);
    136         if (values[count]) {
    137             keys[count] = NSLocalizedRecoverySuggestionErrorKey;
    138             count++;
    139         }
    140 
    141 #pragma clang diagnostic push
    142 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    143         if (userInfo && (values[count] = (id)CFDictionaryGetValue(userInfo, kCFStreamPropertySSLPeerCertificates)) != nil) {
    144             // Need to translate the cert
    145             keys[count] = @"NSErrorPeerCertificateChainKey";
    146             count++;
    147 
    148             values[count] = (id)CFDictionaryGetValue(userInfo, _kCFStreamPropertySSLClientCertificates);
    149             if (values[count]) {
    150                 keys[count] = @"NSErrorClientCertificateChainKey";
    151                 count++;
    152             }
    153 
    154             values[count] = (id)CFDictionaryGetValue(userInfo, _kCFStreamPropertySSLClientCertificateState);
    155             if (values[count]) {
    156                 keys[count] = @"NSErrorClientCertificateStateKey";
    157                 count++;
    158             }
    159         }
    160 #pragma clang diagnostic pop
    161 
    162         if (userInfo && (values[count] = (id)CFDictionaryGetValue(userInfo, kCFStreamPropertySSLPeerTrust)) != nil) {
    163             keys[count] = NSURLErrorFailingURLPeerTrustErrorKey;
    164             count++;
    165         }
    166 
    167         keys[count] = NSUnderlyingErrorKey;
    168         values[count] = (id)cfError;
    169         count++;
    170 
    171         result = [WebCustomNSURLError errorWithDomain:NSURLErrorDomain code:(errCode == kCFURLErrorUnknown ? (CFIndex)NSURLErrorUnknown : errCode) userInfo:[NSDictionary dictionaryWithObjects:values forKeys:keys count:count]];
    172         if (userInfo)
    173             CFRelease(userInfo);
    174         return result;
    175     }
    176     return (NSError *)cfError;
    177 }
    178 #endif // USE(CFURLCONNECTION)
    179 
    18090#endif // PLATFORM(IOS)
    18191
     
    197107    return adoptNS([[NSError alloc] initWithDomain:resourceError.domain() code:resourceError.errorCode() userInfo:userInfo.get()]);
    198108}
    199 
    200 #if USE(CFURLCONNECTION)
    201 
    202 ResourceError::ResourceError(NSError *error)
    203     : ResourceErrorBase(Type::Null)
    204     , m_dataIsUpToDate(false)
    205     , m_platformError(reinterpret_cast<CFErrorRef>(error))
    206 {
    207     if (error)
    208         setType(([error code] == NSURLErrorTimedOut) ? Type::Timeout : Type::General);
    209 }
    210 
    211 NSError *ResourceError::nsError() const
    212 {
    213     if (isNull()) {
    214         ASSERT(!m_platformError);
    215         return nil;
    216     }
    217 
    218     if (m_platformNSError)
    219         return m_platformNSError.get();
    220 
    221     if (m_platformError) {
    222         CFErrorRef error = m_platformError.get();
    223         RetainPtr<CFDictionaryRef> userInfo = adoptCF(CFErrorCopyUserInfo(error));
    224 #if PLATFORM(IOS)
    225         m_platformNSError = NSErrorFromCFError(error, (NSURL *)[(NSDictionary *)userInfo.get() objectForKey:(id) kCFURLErrorFailingURLErrorKey]);
    226         // If NSErrorFromCFError created a new NSError for us, return that.
    227         if (m_platformNSError.get() != (NSError *)error)
    228             return m_platformNSError.get();
    229 
    230         // Otherwise fall through to create a new NSError from the CFError.
    231 #endif
    232         m_platformNSError = adoptNS([[NSError alloc] initWithDomain:(NSString *)CFErrorGetDomain(error) code:CFErrorGetCode(error) userInfo:(NSDictionary *)userInfo.get()]);
    233         return m_platformNSError.get();
    234     }
    235 
    236     m_platformNSError = createNSErrorFromResourceErrorBase(*this);
    237     return m_platformNSError.get();
    238 }
    239 
    240 ResourceError::operator NSError *() const
    241 {
    242     return nsError();
    243 }
    244 
    245 #else
    246109
    247110ResourceError::ResourceError(NSError *nsError)
     
    317180}
    318181
    319 #endif // USE(CFURLCONNECTION)
    320 
    321182} // namespace WebCore
  • trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

    r224373 r224846  
    5656#import <wtf/text/CString.h>
    5757
    58 #if USE(CFURLCONNECTION)
    59 #if USE(APPLE_INTERNAL_SDK)
    60 #import <CFNetwork/CFURLConnectionPriv.h>
    61 #endif
    62 typedef struct _CFURLConnection* CFURLConnectionRef;
    63 extern "C" {
    64 CFDictionaryRef _CFURLConnectionCopyTimingData(CFURLConnectionRef);
    65 }
    66 #endif // USE(CFURLCONNECTION)
    67 
    6858#if PLATFORM(IOS)
    6959#import "RuntimeApplicationChecks.h"
     
    7868
    7969namespace WebCore {
    80    
    81 #if !USE(CFURLCONNECTION)
    8270   
    8371static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential)
     
    114102static bool synchronousWillSendRequestEnabled()
    115103{
    116 #if PLATFORM(IOS)
    117104    static bool disabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisableSynchronousWillSendRequestPreferenceKey"] || IOSApplication::isIBooks();
    118 #else
    119     static bool disabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisableSynchronousWillSendRequestPreferenceKey"];
    120 #endif
    121 
    122105    return !disabled;
    123106}
     
    321304}
    322305
    323 #if !USE(CFURLCONNECTION)
    324 
    325306void ResourceHandle::schedule(SchedulePair& pair)
    326307{
     
    336317        [d->m_connection.get() unscheduleFromRunLoop:runLoop forMode:(NSString *)pair.mode()];
    337318}
    338 
    339 #endif
    340319
    341320id ResourceHandle::makeDelegate(bool shouldUseCredentialStorage, MessageQueue<Function<void()>>* queue)
     
    690669}
    691670
    692 #endif // !USE(CFURLCONNECTION)
    693 
    694 #if USE(CFURLCONNECTION)
    695 
    696 void ResourceHandle::getConnectionTimingData(CFURLConnectionRef connection, NetworkLoadMetrics& timing)
    697 {
    698     copyTimingData((__bridge NSDictionary*)adoptCF(_CFURLConnectionCopyTimingData(connection)).get(), timing);
    699 }
    700 
    701 #else
    702 
    703671void ResourceHandle::getConnectionTimingData(NSURLConnection *connection, NetworkLoadMetrics& timing)
    704672{
     
    706674}
    707675
    708 #endif
    709 
    710676} // namespace WebCore
  • trunk/Source/WebCore/platform/network/mac/SynchronousLoaderClient.mm

    r207585 r224846  
    2727#include "SynchronousLoaderClient.h"
    2828
    29 #if !USE(CFURLCONNECTION)
    30 
    3129#include "AuthenticationChallenge.h"
    3230
     
    3937}
    4038
    41 #if !USE(CFURLCONNECTION)
    4239ResourceError SynchronousLoaderClient::platformBadResponseError()
    4340{
     
    4542    return error.get();
    4643}
    47 #endif
    4844
    4945}
    50 
    51 #endif // !USE(CFURLCONNECTION)
  • trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h

    r224373 r224846  
    2525
    2626#pragma once
    27 
    28 #if !USE(CFURLCONNECTION)
    2927
    3028#include <dispatch/dispatch.h>
     
    5856
    5957@end
    60 
    61 #endif // !USE(CFURLCONNECTION)
  • trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm

    r224687 r224846  
    2727#import "WebCoreResourceHandleAsOperationQueueDelegate.h"
    2828
    29 #if !USE(CFURLCONNECTION)
    30 
    3129#import "AuthenticationChallenge.h"
    3230#import "AuthenticationMac.h"
     
    359357
    360358@end
    361 
    362 #endif // !USE(CFURLCONNECTION)
    363 
  • trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm

    r224698 r224846  
    328328#endif
    329329
    330 #if !USE(CFURLCONNECTION)
    331330NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentRequest, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
    332331{
     
    342341    return [[[NSHTTPURLResponse alloc] initWithURL:[currentRequest URL] statusCode:302 HTTPVersion:(NSString *)kCFHTTPVersion1_1 headerFields:synthesizedResponseHeaderFields] autorelease];
    343342}
    344 #endif
    345343
    346344}
  • trunk/Source/WebKit/ChangeLog

    r224841 r224846  
     12017-11-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove Cocoa CFURLConnection loading code
     4        https://bugs.webkit.org/show_bug.cgi?id=179688
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * NetworkProcess/Downloads/Download.h:
     9
    1102017-11-14  Daniel Bates  <dabates@apple.com>
    211
  • trunk/Source/WebKit/NetworkProcess/Downloads/Download.h

    r224828 r224846  
    152152    RetainPtr<WKDownloadAsDelegate> m_delegate;
    153153#endif
    154 #if USE(CFURLCONNECTION)
    155     RetainPtr<CFURLDownloadRef> m_download;
    156 #endif
    157154    std::unique_ptr<WebCore::ResourceHandleClient> m_downloadClient;
    158155    RefPtr<WebCore::ResourceHandle> m_resourceHandle;
  • trunk/Source/WebKitLegacy/ChangeLog

    r224629 r224846  
     12017-11-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove Cocoa CFURLConnection loading code
     4        https://bugs.webkit.org/show_bug.cgi?id=179688
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * WebCoreSupport/WebResourceLoadScheduler.cpp:
     9        (WebResourceLoadScheduler::scheduleLoad):
     10
    1112017-11-06  Per Arne Vollan  <pvollan@apple.com>
    212
  • trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp

    r224522 r224846  
    149149    host->schedule(resourceLoader, priority);
    150150
    151 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
     151#if PLATFORM(COCOA)
    152152    if (ResourceRequest::resourcePrioritiesEnabled() && !isSuspendingPendingRequests()) {
    153153        // Serve all requests at once to keep the pipeline full at the network layer.
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r224841 r224846  
     12017-11-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove Cocoa CFURLConnection loading code
     4        https://bugs.webkit.org/show_bug.cgi?id=179688
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * Misc/WebDownload.mm:
     9        (-[WebDownload _initWithLoadingCFURLConnection:request:response:delegate:proxy:]): Deleted.
     10        * Misc/WebDownloadInternal.h:
     11        * Plugins/WebBaseNetscapePluginView.mm:
     12        * WebCoreSupport/WebFrameLoaderClient.mm:
     13        (WebFrameLoaderClient::convertMainResourceLoadToDownload):
     14        * WebView/WebView.mm:
     15        (-[WebView scheduleInRunLoop:forMode:]):
     16        (-[WebView unscheduleFromRunLoop:forMode:]):
     17
    1182017-11-14  Daniel Bates  <dabates@apple.com>
    219
  • trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm

    r220506 r224846  
    3030
    3131#import <Foundation/NSURLAuthenticationChallenge.h>
    32 #import <WebCore/AuthenticationCF.h>
    3332#import <WebCore/AuthenticationMac.h>
    3433#import <WebCore/Credential.h>
     
    4039
    4140#import "WebTypesInternal.h"
    42 
    43 #if USE(CFURLCONNECTION)
    44 #import <CFNetwork/CFNetwork.h>
    45 #import <CFNetwork/CFURLConnection.h>
    46 #endif
    4741
    4842using namespace WebCore;
     
    6256             directory:(NSString *)directory;
    6357
    64 #if USE(CFURLCONNECTION)
    65 - (id)_initWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy;
    66 #endif
    67 
    6858@end
    6959
     
    228218}
    229219
    230 #if USE(CFURLCONNECTION)
    231 - (id)_initWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy
    232 {
    233     [self _setRealDelegate:delegate];
    234     return [super _initWithLoadingCFURLConnection:connection request:request response:response delegate:_webInternal proxy:proxy];
    235 }
    236 #endif
    237 
    238220- (id)_initWithRequest:(NSURLRequest *)request
    239221              delegate:(id)delegate
  • trunk/Source/WebKitLegacy/mac/Misc/WebDownloadInternal.h

    r207585 r224846  
    2828 
    2929#import <WebKitLegacy/WebDownload.h>
    30 
    31 #if USE(CFURLCONNECTION)
    32 #import <CFNetwork/CFURLConnection.h>
    33 #endif
    3430 
    3531@interface WebDownload (WebDownloadCreation)
     
    3834+(id)_downloadWithRequest:(NSURLRequest *)request delegate:(id)delegate directory:(NSString *)directory;
    3935
    40 #if USE(CFURLCONNECTION)
    41 + (id)_downloadWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(id)proxy;
    42 #endif
    43 
    4436@end
  • trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm

    r222896 r224846  
    3838#import "WebView.h"
    3939#import "WebViewInternal.h"
    40 #import <WebCore/AuthenticationCF.h>
    4140#import <WebCore/AuthenticationMac.h>
    4241#import <WebCore/BitmapImage.h>
  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r223981 r224846  
    7474#import "WebViewInternal.h"
    7575#import <JavaScriptCore/JSContextInternal.h>
    76 #import <WebCore/AuthenticationCF.h>
    7776#import <WebCore/AuthenticationMac.h>
    7877#import <WebCore/BackForwardController.h>
     
    321320    ResourceHandle* handle = mainResourceLoader->handle();
    322321
    323 #if USE(CFURLCONNECTION)
    324     ASSERT([WebDownload respondsToSelector:@selector(_downloadWithLoadingCFURLConnection:request:response:delegate:proxy:)]);
    325     auto connection = handle->releaseConnectionForDownload();
    326     [WebDownload _downloadWithLoadingCFURLConnection:connection.get() request:request.cfURLRequest(UpdateHTTPBody) response:response.cfURLResponse() delegate:[webView downloadDelegate] proxy:nil];
    327 #else
    328322    [WebDownload _downloadWithLoadingConnection:handle->connection() request:request.nsURLRequest(UpdateHTTPBody) response:response.nsURLResponse() delegate:[webView downloadDelegate] proxy:nil];
    329 #endif
    330323}
    331324
  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r224833 r224846  
    18681868{
    18691869    RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage();
    1870     ASSERT(cookieStorage); // Will fail when building without USE(CFURLCONNECTION) and NetworkStorageSession::switchToNewTestingSession() was not called beforehand.
     1870    ASSERT(cookieStorage); // Will fail when NetworkStorageSession::switchToNewTestingSession() was not called beforehand.
    18711871    CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
    18721872}
  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r224833 r224846  
    74587458- (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode
    74597459{
    7460 #if USE(CFURLCONNECTION)
    7461     CFRunLoopRef schedulePairRunLoop = [runLoop getCFRunLoop];
    7462 #else
    7463     NSRunLoop *schedulePairRunLoop = runLoop;
    7464 #endif
    74657460    if (runLoop && mode)
    7466         core(self)->addSchedulePair(SchedulePair::create(schedulePairRunLoop, (CFStringRef)mode));
     7461        core(self)->addSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode));
    74677462}
    74687463
    74697464- (void)unscheduleFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode
    74707465{
    7471 #if USE(CFURLCONNECTION)
    7472     CFRunLoopRef schedulePairRunLoop = [runLoop getCFRunLoop];
    7473 #else
    7474     NSRunLoop *schedulePairRunLoop = runLoop;
    7475 #endif
    74767466    if (runLoop && mode)
    7477         core(self)->removeSchedulePair(SchedulePair::create(schedulePairRunLoop, (CFStringRef)mode));
     7467        core(self)->removeSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode));
    74787468}
    74797469
Note: See TracChangeset for help on using the changeset viewer.