Changeset 224846 in webkit
- Timestamp:
- Nov 14, 2017, 2:20:42 PM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 3 deleted
- 59 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r224801 r224846 1 2017-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 1 11 2017-11-13 Brady Eidson <beidson@apple.com> 2 12 -
trunk/Source/WTF/wtf/SchedulePair.h
r218594 r224846 35 35 #include <wtf/text/WTFString.h> 36 36 37 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)37 #if PLATFORM(COCOA) 38 38 OBJC_CLASS NSRunLoop; 39 39 #endif … … 45 45 static Ref<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); } 46 46 47 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)47 #if PLATFORM(COCOA) 48 48 static Ref<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); } 49 49 NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); } … … 63 63 } 64 64 65 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)65 #if PLATFORM(COCOA) 66 66 WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef); 67 67 RetainPtr<NSRunLoop*> m_nsRunLoop; -
trunk/Source/WTF/wtf/SchedulePairMac.mm
r207585 r224846 30 30 #include "SchedulePair.h" 31 31 32 #if !USE(CFURLCONNECTION)33 34 32 namespace WTF { 35 33 … … 43 41 44 42 } // namespace 45 46 #endif -
trunk/Source/WebCore/ChangeLog
r224841 r224846 1 2017-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 1 83 2017-11-14 Daniel Bates <dabates@apple.com> 2 84 -
trunk/Source/WebCore/PlatformMac.cmake
r224267 r224846 442 442 platform/mediastream/mac/MockRealtimeVideoSourceMac.mm 443 443 444 platform/network/cf/AuthenticationCF.cpp445 platform/network/cf/CookieJarCFNet.cpp446 platform/network/cf/CookieStorageCFNet.cpp447 platform/network/cf/CredentialStorageCFNet.cpp448 444 platform/network/cf/DNSCFNet.cpp 449 445 platform/network/cf/FormDataStreamCFNet.cpp 450 platform/network/cf/LoaderRunLoopCF.cpp451 446 platform/network/cf/NetworkStorageSessionCFNet.cpp 452 447 platform/network/cf/ProxyServerCFNet.cpp 453 platform/network/cf/ResourceErrorCF.cpp454 448 platform/network/cf/ResourceRequestCFNet.cpp 455 platform/network/cf/ResourceResponseCFNet.cpp456 449 platform/network/cf/SocketStreamHandleImplCFNet.cpp 457 platform/network/cf/SynchronousLoaderClientCFNet.cpp458 platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp459 450 460 451 platform/network/cocoa/CookieCocoa.mm -
trunk/Source/WebCore/SourcesCocoa.txt
r224731 r224846 87 87 loader/cocoa/DiskCacheMonitorCocoa.mm 88 88 loader/cocoa/SubresourceLoaderCocoa.mm 89 90 loader/cf/ResourceLoaderCFNet.cpp91 89 92 90 loader/mac/DocumentLoaderMac.cpp … … 316 314 platform/mock/MediaPlaybackTargetMock.cpp 317 315 318 platform/network/cf/AuthenticationCF.cpp319 platform/network/cf/CookieJarCFNet.cpp320 platform/network/cf/CookieStorageCFNet.cpp321 platform/network/cf/CredentialStorageCFNet.cpp322 316 platform/network/cf/DNSCFNet.cpp 323 317 platform/network/cf/FormDataStreamCFNet.cpp 324 platform/network/cf/LoaderRunLoopCF.cpp325 318 platform/network/cf/NetworkStorageSessionCFNet.cpp 326 319 platform/network/cf/ProxyServerCFNet.cpp 327 platform/network/cf/ResourceErrorCF.cpp328 320 platform/network/cf/ResourceRequestCFNet.cpp 329 platform/network/cf/ResourceResponseCFNet.cpp330 321 platform/network/cf/SocketStreamHandleImplCFNet.cpp 331 platform/network/cf/SynchronousLoaderClientCFNet.cpp332 322 333 323 platform/network/cocoa/CookieCocoa.mm … … 378 368 379 369 platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp 380 381 platform/network/cf/ResourceHandleCFNet.cpp382 platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp383 384 370 385 371 #if ENABLE_APPLE_PAY -
trunk/Source/WebCore/SourcesIOS.txt
r224123 r224846 115 115 platform/network/ios/NetworkStateNotifierIOS.mm 116 116 platform/network/ios/PreviewConverter.mm 117 platform/network/ios/ResourceHandleIOS.mm118 platform/network/ios/ResourceRequestIOS.mm119 117 platform/network/ios/WebCoreURLResponseIOS.mm 120 121 platform/network/mac/ResourceRequestMac.mm122 118 123 119 platform/text/ios/LocalizedDateCache.mm -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r224826 r224846 655 655 26B999931803B9D900D01121 /* FunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999921803B9D900D01121 /* FunctionCall.h */; }; 656 656 26B999971804D54200D01121 /* SelectorCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999951804D54200D01121 /* SelectorCompiler.h */; }; 657 26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */; };658 657 26E944D91AC4B2DD007B85B5 /* CombinedURLFilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E944D51AC4B2DD007B85B5 /* CombinedURLFilters.h */; settings = {ATTRIBUTES = (Private, ); }; }; 659 658 26E944DD1AC4B4EA007B85B5 /* Term.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E944DC1AC4B4EA007B85B5 /* Term.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 669 668 26F9A83818A046AC00AEB88A /* ViewportConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F9A83618A046AC00AEB88A /* ViewportConfiguration.cpp */; }; 670 669 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 */; };673 670 2914E3081CAB5A440049966F /* AccessibilityAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2914E3061CAB5A440049966F /* AccessibilityAttachment.h */; }; 674 671 2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 2138 2135 7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */; }; 2139 2136 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, ); }; };2141 2137 7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2142 2138 7EE6846712D26E3800E79415 /* FormDataStreamCFNet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */; }; 2143 7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */; };2144 2139 7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845712D26E3800E79415 /* ResourceError.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2145 2140 7EE6846D12D26E3800E79415 /* ResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6845A12D26E3800E79415 /* ResourceRequest.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 6127 6122 26B999941804D54200D01121 /* SelectorCompiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectorCompiler.cpp; sourceTree = "<group>"; }; 6128 6123 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>"; };6131 6124 26D4E8451B42539D00E033A2 /* DFANode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFANode.cpp; sourceTree = "<group>"; }; 6132 6125 26E944D41AC4B2DD007B85B5 /* CombinedURLFilters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CombinedURLFilters.cpp; sourceTree = "<group>"; }; … … 6148 6141 26F9A83618A046AC00AEB88A /* ViewportConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportConfiguration.cpp; sourceTree = "<group>"; }; 6149 6142 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>"; };6152 6143 2914E3051CAB5A440049966F /* AccessibilityAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityAttachment.cpp; sourceTree = "<group>"; }; 6153 6144 2914E3061CAB5A440049966F /* AccessibilityAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityAttachment.h; sourceTree = "<group>"; }; … … 7202 7193 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPlugInImageElement.h; sourceTree = "<group>"; }; 7203 7194 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>"; };7205 7195 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; }; 7206 7196 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; }; … … 7583 7573 514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceErrorMac.mm; sourceTree = "<group>"; }; 7584 7574 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>"; };7586 7575 514C76580CE923A1007EF3CD /* CredentialBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialBase.cpp; sourceTree = "<group>"; }; 7587 7576 514C76590CE923A1007EF3CD /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = "<group>"; }; … … 9291 9280 7D4C96D81AD4483500365A50 /* JSFetchHeaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchHeaders.cpp; sourceTree = "<group>"; }; 9292 9281 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>"; };9294 9282 7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESElementIndexUint.cpp; sourceTree = "<group>"; }; 9295 9283 7E46F6F91627A2C900062223 /* JSOESElementIndexUint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESElementIndexUint.h; sourceTree = "<group>"; }; … … 9314 9302 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; }; 9315 9303 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>"; };9317 9304 7E8FADC3199A95B100714968 /* SubresourceLoaderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SubresourceLoaderCocoa.mm; sourceTree = "<group>"; }; 9318 9305 7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFocusAllowedIndicator.cpp; sourceTree = "<group>"; }; … … 9325 9312 7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; }; 9326 9313 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>"; };9329 9314 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>"; };9333 9315 7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataStreamCFNet.cpp; sourceTree = "<group>"; }; 9334 9316 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>"; };9337 9317 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>"; };9340 9318 7EE6845A12D26E3800E79415 /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequest.h; sourceTree = "<group>"; }; 9341 9319 7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceRequestCFNet.cpp; sourceTree = "<group>"; }; 9342 9320 7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceRequestCFNet.h; sourceTree = "<group>"; }; 9343 9321 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>"; };9346 9322 7F4C96D81AD4483500365A50 /* JSFetchBody.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchBody.cpp; sourceTree = "<group>"; }; 9347 9323 7F4C96D81AD4483500365A51 /* JSReadableStreamSink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamSink.cpp; sourceTree = "<group>"; }; … … 16521 16497 A1C150771E3F2B3E0032C98C /* PreviewConverter.mm */, 16522 16498 A10DBF4618F92317000D70C6 /* PreviewLoaderClient.h */, 16523 7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */,16524 7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */,16525 16499 44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */, 16526 16500 444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */, … … 18268 18242 514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */, 18269 18243 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */, 18270 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */,18271 18244 E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */, 18272 18245 1FAFBF1615A5FA5200083A20 /* UTIUtilities.h */, … … 19097 19070 ); 19098 19071 path = cocoa; 19099 sourceTree = "<group>";19100 };19101 7EE6847312D26E5500E79415 /* cf */ = {19102 isa = PBXGroup;19103 children = (19104 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,19105 );19106 path = cf;19107 19072 sourceTree = "<group>"; 19108 19073 }; … … 22888 22853 isa = PBXGroup; 22889 22854 children = ( 22890 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */,22891 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */,22892 22855 7EE6844E12D26E3800E79415 /* AuthenticationChallenge.h */, 22893 22856 5F2DBBE8178E336900141486 /* CertificateInfo.h */, 22894 7EE6844F12D26E3800E79415 /* CookieJarCFNet.cpp */,22895 7EE6845012D26E3800E79415 /* CookieStorageCFNet.cpp */,22896 7EE6845212D26E3800E79415 /* CredentialStorageCFNet.cpp */,22897 22857 B2F34FE80E82F82700F627CD /* DNSCFNet.cpp */, 22898 22858 7EE6845312D26E3800E79415 /* FormDataStreamCFNet.cpp */, 22899 22859 7EE6845412D26E3800E79415 /* FormDataStreamCFNet.h */, 22900 7EE6845512D26E3800E79415 /* LoaderRunLoopCF.cpp */,22901 7EE6845612D26E3800E79415 /* LoaderRunLoopCF.h */,22902 22860 E13EF34716850C470034C83F /* NetworkStorageSessionCFNet.cpp */, 22903 22861 1AF8E1C1125673E000230FF7 /* ProxyServerCFNet.cpp */, 22904 22862 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 */,22911 22863 7EE6845A12D26E3800E79415 /* ResourceRequest.h */, 22912 22864 7EE6845B12D26E3800E79415 /* ResourceRequestCFNet.cpp */, 22913 22865 7EE6845C12D26E3800E79415 /* ResourceRequestCFNet.h */, 22914 22866 7EE6845D12D26E3800E79415 /* ResourceResponse.h */, 22915 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,22916 22867 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */, 22917 22868 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */, 22918 442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */,22919 22869 ); 22920 22870 path = cf; … … 23290 23240 512DD8E80D91E691000F89EE /* archive */, 23291 23241 A8D2B2521287A56000AF4DDA /* cache */, 23292 7EE6847312D26E5500E79415 /* cf */,23293 23242 7E4DE10B198B10810051CB02 /* cocoa */, 23294 23243 5126E6B60A2E3AEF005C29FA /* icon */, … … 26124 26073 07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */, 26125 26074 FD31608B12B026F700C1A359 /* AudioUtilities.h in Headers */, 26126 7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,26127 26075 7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */, 26128 26076 934F713A0D5A6F1000018D69 /* AuthenticationChallengeBase.h in Headers */, … … 28173 28121 9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */, 28174 28122 656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */, 28175 7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,28176 28123 51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */, 28177 28124 8A12E35D11FA33280025836A /* LoadTiming.h in Headers */, … … 28810 28757 934F713C0D5A6F1900018D69 /* ResourceErrorBase.h in Headers */, 28811 28758 514C76790CE923A1007EF3CD /* ResourceHandle.h in Headers */, 28812 26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */,28813 26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */,28814 28759 514C767A0CE923A1007EF3CD /* ResourceHandleClient.h in Headers */, 28815 28760 514C767B0CE923A1007EF3CD /* ResourceHandleInternal.h in Headers */, … … 30363 30308 CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */, 30364 30309 CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */, 30365 26FAE4CC1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.cpp in Sources */,30366 30310 316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */, 30367 30311 BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */, -
trunk/Source/WebCore/loader/DocumentLoader.h
r224758 r224846 54 54 #endif 55 55 56 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)56 #if PLATFORM(COCOA) 57 57 #include <wtf/SchedulePair.h> 58 58 #endif … … 157 157 const String& overrideEncoding() const { return m_overrideEncoding; } 158 158 159 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)159 #if PLATFORM(COCOA) 160 160 void schedule(SchedulePair&); 161 161 void unschedule(SchedulePair&); -
trunk/Source/WebCore/loader/EmptyFrameLoaderClient.h
r223981 r224846 189 189 #endif 190 190 191 #if PLATFORM(WIN) &&USE(CFURLCONNECTION)191 #if USE(CFURLCONNECTION) 192 192 bool shouldCacheResponse(DocumentLoader*, unsigned long, const ResourceResponse&, const unsigned char*, unsigned long long) final { return true; } 193 193 #endif -
trunk/Source/WebCore/loader/FrameLoaderClient.h
r223981 r224846 301 301 #endif 302 302 303 #if PLATFORM(WIN) &&USE(CFURLCONNECTION)303 #if USE(CFURLCONNECTION) 304 304 // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>. 305 305 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 763 763 } 764 764 765 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)765 #if PLATFORM(COCOA) 766 766 767 767 void ResourceLoader::schedule(SchedulePair& pair) -
trunk/Source/WebCore/loader/ResourceLoader.h
r224522 r224846 138 138 const LoadTiming& loadTiming() { return m_loadTiming; } 139 139 140 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)140 #if PLATFORM(COCOA) 141 141 void schedule(WTF::SchedulePair&); 142 142 void unschedule(WTF::SchedulePair&); … … 158 158 void didReceiveDataOrBuffer(const char*, unsigned, RefPtr<SharedBuffer>&&, long long encodedDataLength, DataPayloadType); 159 159 160 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)160 #if PLATFORM(COCOA) 161 161 NSCachedURLResponse* willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override; 162 #endif163 #if PLATFORM(COCOA) && USE(CFURLCONNECTION)164 CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;165 162 #endif 166 163 … … 203 200 RetainPtr<CFDictionaryRef> connectionProperties(ResourceHandle*) override; 204 201 #endif 205 #if PLATFORM(WIN) &&USE(CFURLCONNECTION)202 #if USE(CFURLCONNECTION) 206 203 // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>. 207 204 bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override; -
trunk/Source/WebCore/loader/SubresourceLoader.h
r224522 r224846 77 77 void didRetrieveDerivedDataFromCache(const String& type, SharedBuffer&) override; 78 78 79 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)79 #if PLATFORM(COCOA) 80 80 NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse*) override; 81 #endif82 #if PLATFORM(COCOA) && USE(CFURLCONNECTION)83 CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef) override;84 81 #endif 85 82 -
trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp
r207585 r224846 27 27 #include "ResourceLoader.h" 28 28 29 #if USE(CFURLCONNECTION)30 31 29 #include "FrameLoader.h" 32 30 #include "FrameLoaderClient.h" … … 34 32 namespace WebCore { 35 33 36 #if PLATFORM(WIN) 34 #if PLATFORM(WIN) && USE(CFURLCONNECTION) 37 35 38 36 bool ResourceLoader::shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef cachedResponse) … … 49 47 50 48 } // namespace WebCore 51 52 #endif // USE(CFURLCONNECTION) -
trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm
r220243 r224846 36 36 namespace WebCore { 37 37 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 #else49 50 38 NSCachedURLResponse* SubresourceLoader::willCacheResponse(ResourceHandle* handle, NSCachedURLResponse* response) 51 39 { … … 56 44 } 57 45 58 #endif59 60 46 } -
trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp
r223149 r224846 34 34 namespace WebCore { 35 35 36 #if !USE(CFURLCONNECTION)37 38 36 static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair) 39 37 { … … 66 64 } 67 65 68 #endif69 70 66 } // namespace WebCore -
trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm
r220243 r224846 32 32 #include "FrameLoader.h" 33 33 #include "FrameLoaderClient.h" 34 #include "SharedBuffer.h"35 #include <pal/spi/cf/CFNetworkSPI.h>36 34 37 35 namespace 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 #else51 36 52 37 NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCachedURLResponse* response) … … 57 42 } 58 43 59 #endif60 61 44 } -
trunk/Source/WebCore/page/mac/PageMac.mm
r223206 r224846 47 47 { 48 48 #if PLATFORM(IOS) 49 #if USE(CFURLCONNECTION) 50 addSchedulePair(SchedulePair::create(WebThreadRunLoop(), kCFRunLoopCommonModes)); 49 addSchedulePair(SchedulePair::create(WebThreadNSRunLoop(), kCFRunLoopCommonModes)); 51 50 #else 52 addSchedulePair(SchedulePair::create(WebThreadNSRunLoop(), kCFRunLoopCommonModes));53 #endif // USE(CFURLCONNECTION)54 #else55 #if USE(CFURLCONNECTION)56 51 addSchedulePair(SchedulePair::create([[NSRunLoop currentRunLoop] getCFRunLoop], kCFRunLoopCommonModes)); 57 #else58 addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));59 #endif60 52 #endif 61 53 … … 75 67 m_scheduledRunLoopPairs->add(pair.ptr()); 76 68 77 #if !USE(CFURLCONNECTION)78 69 for (Frame* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) { 79 70 if (DocumentLoader* documentLoader = frame->loader().documentLoader()) … … 82 73 documentLoader->schedule(pair); 83 74 } 84 #endif85 75 86 76 // FIXME: make SharedTimerMac use these SchedulePairs. … … 95 85 m_scheduledRunLoopPairs->remove(pair.ptr()); 96 86 97 #if !USE(CFURLCONNECTION)98 87 for (Frame* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) { 99 88 if (DocumentLoader* documentLoader = frame->loader().documentLoader()) … … 102 91 documentLoader->unschedule(pair); 103 92 } 104 #endif105 93 } 106 94 -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
r224574 r224846 117 117 #endif 118 118 119 #if USE(CFURLCONNECTION)120 #include <pal/spi/cocoa/CFNSURLConnectionSPI.h>121 #endif122 123 119 #import "CoreVideoSoftLink.h" 124 120 #import "MediaRemoteSoftLink.h" … … 391 387 return globalQueue; 392 388 } 393 #endif394 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) override417 {418 [[m_challenge sender] useCredential:credential.nsCredential() forAuthenticationChallenge:m_challenge.get()];419 }420 421 void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&) override422 {423 [[m_challenge sender] continueWithoutCredentialForAuthenticationChallenge:m_challenge.get()];424 }425 426 void receivedCancellation(const AuthenticationChallenge&) override427 {428 [[m_challenge sender] cancelAuthenticationChallenge:m_challenge.get()];429 }430 431 void receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&) override432 {433 if ([[m_challenge sender] respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)])434 [[m_challenge sender] performDefaultHandlingForAuthenticationChallenge:m_challenge.get()];435 }436 437 void receivedChallengeRejection(const AuthenticationChallenge&) override438 {439 if ([[m_challenge sender] respondsToSelector:@selector(rejectProtectionSpaceAndContinueWithChallenge:)])440 [[m_challenge sender] rejectProtectionSpaceAndContinueWithChallenge:m_challenge.get()];441 }442 443 RetainPtr<NSURLAuthenticationChallenge> m_challenge;444 };445 389 #endif 446 390 … … 1870 1814 } 1871 1815 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 1816 bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForResponseToAuthenticationChallenge(NSURLAuthenticationChallenge* challenge) 1817 { 1882 1818 return player()->shouldWaitForResponseToAuthenticationChallenge(challenge); 1883 1819 } -
trunk/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
r207585 r224846 28 28 #include "ProtectionSpace.h" 29 29 30 #if USE(CFURLCONNECTION) && !PLATFORM(COCOA)30 #if USE(CFURLCONNECTION) 31 31 #include "AuthenticationCF.h" 32 32 #include <CFNetwork/CFURLProtectionSpacePriv.h> … … 119 119 } 120 120 121 122 121 bool ProtectionSpaceBase::compare(const ProtectionSpace& a, const ProtectionSpace& b) 123 122 { -
trunk/Source/WebCore/platform/network/ResourceHandle.h
r224373 r224846 126 126 #endif 127 127 128 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)128 #if PLATFORM(COCOA) 129 129 WEBCORE_EXPORT NSURLConnection *connection() const; 130 130 id makeDelegate(bool, WTF::MessageQueue<WTF::Function<void()>>*); … … 206 206 WEBCORE_EXPORT void continueWillCacheResponse(CFCachedURLResponseRef); 207 207 #endif 208 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)208 #if PLATFORM(COCOA) 209 209 WEBCORE_EXPORT void continueWillCacheResponse(NSCachedURLResponse *); 210 210 #endif … … 224 224 #if PLATFORM(COCOA) || USE(CFURLCONNECTION) 225 225 WEBCORE_EXPORT static CFStringRef synchronousLoadRunLoopMode(); 226 #endif227 228 #if PLATFORM(IOS) && USE(CFURLCONNECTION)229 static CFMutableDictionaryRef createSSLPropertiesFromNSURLRequest(const ResourceRequest&);230 226 #endif 231 227 … … 270 266 #endif 271 267 272 #if PLATFORM(MAC) && !USE(CFURLCONNECTION)268 #if PLATFORM(MAC) 273 269 void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, SchedulingBehavior); 274 270 #endif 275 271 276 #if PLATFORM(IOS) && !USE(CFURLCONNECTION)272 #if PLATFORM(IOS) 277 273 void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, bool shouldContentEncodingSniff, SchedulingBehavior, NSDictionary *connectionProperties); 278 274 #endif -
trunk/Source/WebCore/platform/network/ResourceHandleInternal.h
r224395 r224846 122 122 RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate; 123 123 #endif 124 #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)124 #if PLATFORM(COCOA) 125 125 RetainPtr<NSURLConnection> m_connection; 126 126 RetainPtr<id> m_delegate; -
trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp
r210890 r224846 45 45 46 46 AuthenticationChallenge::AuthenticationChallenge(CFURLAuthChallengeRef cfChallenge, AuthenticationClient* authenticationClient) 47 #if PLATFORM(COCOA)48 : AuthenticationChallengeBase(ProtectionSpace(CFURLAuthChallengeGetProtectionSpace(cfChallenge)), Credential(CFURLAuthChallengeGetProposedCredential(cfChallenge)),49 #else50 47 : AuthenticationChallengeBase(core(CFURLAuthChallengeGetProtectionSpace(cfChallenge)), core(CFURLAuthChallengeGetProposedCredential(cfChallenge)), 51 #endif52 48 CFURLAuthChallengeGetPreviousFailureCount(cfChallenge), (CFURLResponseRef)CFURLAuthChallengeGetFailureResponse(cfChallenge), CFURLAuthChallengeGetError(cfChallenge)) 53 49 , m_authenticationClient(authenticationClient) … … 81 77 // FIXME: Why not cache CFURLAuthChallengeRef in m_cfChallenge? Foundation counterpart does that. 82 78 83 #if PLATFORM(COCOA)84 CFURLAuthChallengeRef result = CFURLAuthChallengeCreate(0, coreChallenge.protectionSpace().cfSpace(), coreChallenge.proposedCredential().cfCredential(),85 #else86 79 RetainPtr<CFURLCredentialRef> credential = adoptCF(createCF(coreChallenge.proposedCredential())); 87 80 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()); 93 82 return result; 94 83 } 95 84 96 #if !PLATFORM(COCOA)97 85 CFURLCredentialRef createCF(const Credential& coreCredential) 98 86 { … … 276 264 scheme); 277 265 } 278 #endif279 266 280 267 } -
trunk/Source/WebCore/platform/network/cf/AuthenticationCF.h
r207585 r224846 40 40 41 41 CFURLAuthChallengeRef createCF(const AuthenticationChallenge&); 42 #if PLATFORM(WIN)43 42 CFURLCredentialRef createCF(const Credential&); 44 43 CFURLProtectionSpaceRef createCF(const ProtectionSpace&); 45 #endif46 47 #if PLATFORM(COCOA)48 AuthenticationChallenge core(CFURLAuthChallengeRef);49 #endif50 #if PLATFORM(WIN)51 44 Credential core(CFURLCredentialRef); 52 45 ProtectionSpace core(CFURLProtectionSpaceRef); 53 #endif54 46 } 55 47 -
trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
r224267 r224846 36 36 #include <CFNetwork/CFHTTPCookiesPriv.h> 37 37 #include <CoreFoundation/CoreFoundation.h> 38 #include <WebKitSystemInterface/WebKitSystemInterface.h> 38 39 #include <pal/spi/cf/CFNetworkSPI.h> 40 #include <windows.h> 39 41 #include <wtf/SoftLinking.h> 40 42 #include <wtf/cf/TypeCastsCF.h> 41 43 #include <wtf/text/WTFString.h> 42 44 43 #if PLATFORM(WIN)44 #include <WebKitSystemInterface/WebKitSystemInterface.h>45 #include <windows.h>46 #endif47 48 #if PLATFORM(WIN)49 45 enum { 50 46 CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3 51 47 }; 52 #endif53 48 54 49 namespace WTF { … … 131 126 ASSERT(!secure || (secure && url.protocolIs("https"))); 132 127 133 #if PLATFORM(COCOA)134 return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));135 #else136 // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.137 128 UNUSED_PARAM(firstParty); 138 129 return adoptCF(CFHTTPCookieStorageCopyCookiesForURL(session.cookieStorage().get(), url.createCFURL().get(), secure)); 139 #endif140 130 } 141 131 142 132 static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url) 143 133 { 144 #if PLATFORM(IOS)145 CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);146 #else147 134 CFArrayRef parsedCookies = CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url); 148 #endif149 135 if (!parsedCookies) 150 136 parsedCookies = CFArrayCreate(kCFAllocatorDefault, 0, 0, &kCFTypeArrayCallBacks); … … 289 275 } 290 276 291 #if PLATFORM(WIN)292 277 void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames) 293 278 { … … 297 282 { 298 283 } 299 #endif300 284 301 285 } // namespace WebCore -
trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
r222898 r224846 27 27 #include "CookieStorage.h" 28 28 29 #include "LoaderRunLoopCF.h" 29 30 #include "NetworkStorageSession.h" 31 #include <CFNetwork/CFHTTPCookiesPriv.h> 32 #include <WebKitSystemInterface/WebKitSystemInterface.h> 30 33 #include <wtf/Function.h> 31 34 #include <wtf/HashMap.h> … … 33 36 #include <wtf/NeverDestroyed.h> 34 37 35 #if PLATFORM(WIN)36 #include "LoaderRunLoopCF.h"37 #include <CFNetwork/CFHTTPCookiesPriv.h>38 #include <WebKitSystemInterface/WebKitSystemInterface.h>39 #endif40 41 38 namespace WebCore { 42 43 #if PLATFORM(WIN)44 39 45 40 static HashMap<CFHTTPCookieStorageRef, WTF::Function<void ()>>& cookieChangeCallbackMap() … … 102 97 } 103 98 104 #endif // PLATFORM(WIN)105 106 99 } // namespace WebCore -
trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
r222898 r224846 32 32 #include "Credential.h" 33 33 #include "ProtectionSpace.h" 34 #include <WebKitSystemInterface/WebKitSystemInterface.h> 34 35 #include <pal/spi/cf/CFNetworkSPI.h> 35 36 #include <wtf/RetainPtr.h> 36 37 #if PLATFORM(WIN)38 #include <WebKitSystemInterface/WebKitSystemInterface.h>39 #endif40 41 #if PLATFORM(IOS)42 #include <CFNetwork/CFURLCredentialStorage.h>43 #endif44 37 45 38 namespace WebCore { … … 53 46 Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace) 54 47 { 55 #if PLATFORM(COCOA)56 auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpace.cfSpace()));57 return Credential(credentialCF.get());58 #else59 48 auto protectionSpaceCF = adoptCF(createCF(protectionSpace)); 60 49 auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpaceCF.get())); 61 50 return core(credentialCF.get()); 62 #endif63 51 } 64 52 -
trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
r207585 r224846 32 32 #include <CoreFoundation/CFError.h> 33 33 #include <CFNetwork/CFNetworkErrors.h> 34 #include <WebKitSystemInterface/WebKitSystemInterface.h> 34 35 #include <wtf/RetainPtr.h> 35 36 #if PLATFORM(WIN)37 #include <WebKitSystemInterface/WebKitSystemInterface.h>38 #endif39 36 40 37 namespace WebCore { … … 49 46 } 50 47 51 #if PLATFORM(WIN)52 48 ResourceError::ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate) 53 49 : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription, Type::General) … … 69 65 m_certificate = certificate; 70 66 } 71 #endif // PLATFORM(WIN)72 67 73 68 const CFStringRef failingURLStringKey = CFSTR("NSErrorFailingURLStringKey"); … … 112 107 m_localizedDescription = (CFStringRef) CFDictionaryGetValue(userInfo.get(), kCFErrorLocalizedDescriptionKey); 113 108 114 #if PLATFORM(WIN)115 109 m_certificate = wkGetSSLPeerCertificateData(userInfo.get()); 116 #endif117 110 } 118 111 … … 123 116 void ResourceError::doPlatformIsolatedCopy(const ResourceError& other) 124 117 { 125 #if PLATFORM(WIN)126 118 m_certificate = other.m_certificate; 127 #else128 UNUSED_PARAM(other);129 #endif130 119 } 131 120 … … 155 144 } 156 145 157 #if PLATFORM(WIN)158 146 if (m_certificate) 159 147 wkSetSSLPeerCertificateData(userInfo.get(), m_certificate.get()); 160 #endif161 148 162 149 m_platformError = adoptCF(CFErrorCreate(0, m_domain.createCFString().get(), m_errorCode, userInfo.get())); -
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
r224373 r224846 57 57 #include <wtf/text/CString.h> 58 58 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 #endif66 #endif67 68 59 #if PLATFORM(WIN) 69 60 #include <WebKitSystemInterface/WebKitSystemInterface.h> -
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
r223728 r224846 32 32 #include "NetworkingContext.h" 33 33 #include "ResourceHandle.h" 34 #include <WebKitSystemInterface/WebKitSystemInterface.h> 34 35 #include <pal/spi/cf/CFNetworkSPI.h> 35 36 #if PLATFORM(WIN)37 #include <WebKitSystemInterface/WebKitSystemInterface.h>38 #endif39 36 40 37 namespace WebCore { -
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
r224373 r224846 74 74 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupRequest(CFMutableURLRequestRef request) 75 75 { 76 #if PLATFORM(IOS)77 CFURLRequestSetShouldStartSynchronously(request, 1);78 #endif79 76 CFURLRef requestURL = CFURLRequestGetURL(request); 80 77 if (!requestURL) … … 83 80 } 84 81 85 #if PLATFORM(WIN)86 82 LRESULT CALLBACK hookToRemoveCFNetworkMessage(int code, WPARAM wParam, LPARAM lParam) 87 83 { … … 101 97 } 102 98 } 103 #endif104 99 105 100 static void emptyPerform(void*) … … 133 128 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::setupConnectionScheduling(CFURLConnectionRef connection) 134 129 { 135 #if PLATFORM(WIN)136 130 installHookToRemoveCFNetworkMessageBlockingMainThread(); 137 #endif138 131 CFRunLoopRef runLoop = getRunLoop(); 139 132 CFURLConnectionScheduleWithRunLoop(connection, runLoop, kCFRunLoopDefaultMode); … … 202 195 if (statusCode != 304) { 203 196 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 210 199 if (_CFURLRequestCopyProtocolPropertyForKey(handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType"))) 211 200 CFURLResponseSetMIMEType(cfResponse.get(), CFSTR("text/html")); 212 #endif // !PLATFORM(IOS)213 201 214 202 ResourceResponse resourceResponse(cfResponse.get()); 215 203 resourceResponse.setSource(ResourceResponse::Source::Network); 216 #if !PLATFORM(WIN)217 ResourceHandle::getConnectionTimingData(connection.get(), resourceResponse.deprecatedNetworkLoadMetrics());218 #endif219 220 204 handle->didReceiveResponse(WTFMove(resourceResponse)); 221 205 }; … … 298 282 CFCachedURLResponseRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse(CFCachedURLResponseRef cachedResponse) 299 283 { 300 #if PLATFORM(WIN)301 284 // Workaround for <rdar://problem/6300990> Caching does not respect Vary HTTP header. 302 285 // FIXME: WebCore cache has issues with Vary, too (bug 58797, bug 71509). … … 308 291 return nullptr; 309 292 } 310 #endif // PLATFORM(WIN)311 293 312 294 auto work = [protectedThis = makeRef(*this), cachedResponse = RetainPtr<CFCachedURLResponseRef>(cachedResponse)] () { … … 386 368 387 369 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)395 370 handle->canAuthenticateAgainstProtectionSpace(coreProtectionSpace); 396 371 }; -
trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
r222898 r224846 44 44 { 45 45 if (!m_cfResponse && !m_isNull) { 46 #if PLATFORM(COCOA)47 nsURLResponse();48 #else49 46 RetainPtr<CFURLRef> url = m_url.createCFURL(); 50 47 // FIXME: This creates a very incomplete CFURLResponse, which does not even have a status code. 51 48 m_cfResponse = adoptCF(CFURLResponseCreate(0, url.get(), m_mimeType.string().createCFString().get(), m_expectedContentLength, m_textEncodingName.string().createCFString().get(), kCFURLCacheStorageAllowed)); 52 #endif53 49 } 54 50 … … 113 109 } 114 110 115 #if !PLATFORM(COCOA)116 111 CertificateInfo ResourceResponse::platformCertificateInfo() const 117 112 { 118 113 return { }; 119 114 } 120 #endif121 115 122 116 String ResourceResponse::platformSuggestedFilename() const -
trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm
r207585 r224846 26 26 #import "config.h" 27 27 #import "CredentialCocoa.h" 28 29 #if USE(CFURLCONNECTION)30 @interface NSURLCredential (WebDetails)31 - (id)_initWithCFURLCredential:(CFURLCredentialRef)credential;32 - (CFURLCredentialRef) _CFURLCredential;33 @end34 #endif35 28 36 29 namespace WebCore { … … 85 78 } 86 79 87 #if USE(CFURLCONNECTION)88 Credential::Credential(CFURLCredentialRef credential)89 : Credential(adoptNS([[NSURLCredential alloc] _initWithCFURLCredential:credential]).get())90 {91 }92 #endif93 94 80 Credential::Credential(NSURLCredential *credential) 95 81 : CredentialBase(credential.user, credential.password, toCredentialPersistence(credential.persistence)) … … 97 83 { 98 84 } 99 100 #if USE(CFURLCONNECTION)101 CFURLCredentialRef Credential::cfCredential() const102 {103 return [nsCredential() _CFURLCredential];104 }105 #endif106 85 107 86 NSURLCredential *Credential::nsCredential() const -
trunk/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
r207585 r224846 27 27 #import "ProtectionSpaceCocoa.h" 28 28 29 #if USE(CFURLCONNECTION)30 @interface NSURLProtectionSpace (WebDetails)31 - (CFURLProtectionSpaceRef) _CFURLProtectionSpace;32 - (id)_initWithCFURLProtectionSpace:(CFURLProtectionSpaceRef)cfProtSpace;33 @end34 #endif35 36 29 namespace WebCore { 37 38 #if USE(CFURLCONNECTION)39 ProtectionSpace::ProtectionSpace(CFURLProtectionSpaceRef space)40 : ProtectionSpace(adoptNS([[NSURLProtectionSpace alloc] _initWithCFURLProtectionSpace:space]).get())41 {42 }43 #endif44 30 45 31 static ProtectionSpaceServerType type(NSURLProtectionSpace *space) … … 105 91 m_nsSpace = space; 106 92 } 107 108 #if USE(CFURLCONNECTION)109 CFURLProtectionSpaceRef ProtectionSpace::cfSpace() const110 {111 return [nsSpace() _CFURLProtectionSpace];112 }113 #endif114 93 115 94 NSURLProtectionSpace *ProtectionSpace::nsSpace() const -
trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
r224371 r224846 43 43 { 44 44 updatePlatformRequest(bodyPolicy); 45 #if USE(CFURLCONNECTION)46 if (!m_nsRequest)47 const_cast<ResourceRequest*>(this)->updateNSURLRequest();48 #endif49 45 return [[m_nsRequest.get() retain] autorelease]; 50 46 } 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 delegate57 // callbacks, an object of the same type that they passed into WebKit. To keep then running, we58 // 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 an60 // 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 else71 m_nsRequest = nullptr;72 }73 74 #else75 47 76 48 CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const … … 263 235 } 264 236 265 #endif // USE(CFURLCONNECTION)266 267 237 NSURLRequest *copyRequestWithStorageSession(CFURLStorageSessionRef storageSession, NSURLRequest *request) 268 238 { -
trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm
r224644 r224846 76 76 CertificateInfo ResourceResponse::platformCertificateInfo() const 77 77 { 78 #if USE(CFURLCONNECTION)79 ASSERT(m_cfResponse || source() == Source::ServiceWorker);80 CFURLResponseRef cfResponse = m_cfResponse.get();81 #else82 78 ASSERT(m_nsResponse || source() == Source::ServiceWorker); 83 79 CFURLResponseRef cfResponse = [m_nsResponse _CFURLResponse]; 84 #endif85 80 86 81 if (!cfResponse) … … 114 109 #endif 115 110 } 116 117 #if USE(CFURLCONNECTION)118 119 NSURLResponse *ResourceResponse::nsURLResponse() const120 {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 #else145 111 146 112 static NSString* const commonHeaderFields[] = { … … 243 209 } 244 210 245 #endif // USE(CFURLCONNECTION)246 247 211 } // namespace WebCore 248 212 -
trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm
r220506 r224846 26 26 #import "AuthenticationMac.h" 27 27 28 #import "AuthenticationCF.h"29 28 #import "AuthenticationChallenge.h" 30 29 #import "AuthenticationClient.h" … … 33 32 #import <Foundation/NSURLProtectionSpace.h> 34 33 35 #if USE(CFURLCONNECTION)36 #import <pal/spi/cocoa/CFNSURLConnectionSPI.h>37 #endif38 39 34 using namespace WebCore; 40 35 … … 42 37 { 43 38 AuthenticationClient* m_client; 44 #if USE(CFURLCONNECTION)45 CFURLAuthChallengeRef m_cfChallenge;46 #endif47 39 } 48 40 - (id)initWithAuthenticationClient:(AuthenticationClient*)client; … … 102 94 } 103 95 104 #if USE(CFURLCONNECTION)105 - (void)setCFChallenge:(CFURLAuthChallengeRef)challenge106 {107 m_cfChallenge = challenge;108 }109 110 - (CFURLAuthChallengeRef)cfChallenge111 {112 return m_cfChallenge;113 }114 #endif115 116 96 @end 117 97 118 98 namespace 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 #else139 return [[NSURLAuthenticationChallenge _authenticationChallengeForCFAuthChallenge:authChallenge.get() sender:challengeSender.get()] autorelease];140 #endif141 }142 143 #else144 99 145 100 AuthenticationChallenge::AuthenticationChallenge(const ProtectionSpace& protectionSpace, … … 184 139 return [static_cast<WebCoreAuthenticationClientAsChallengeSender*>(m_sender.get()) client]; 185 140 186 return 0;141 return nullptr; 187 142 } 188 143 … … 203 158 return coreChallenge.nsURLAuthenticationChallenge(); 204 159 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]; 211 161 } 212 162 … … 216 166 } 217 167 218 #endif // USE(CFURLCONNECTION)219 220 168 } // namespace WebCore -
trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm
r224267 r224846 32 32 #import <wtf/BlockObjCExceptions.h> 33 33 34 #if !USE(CFURLCONNECTION)35 36 34 #import "Cookie.h" 37 35 #import "CookieStorage.h" … … 44 42 @end 45 43 46 #endif47 48 44 namespace WebCore { 49 45 … … 66 62 CFHTTPCookieStorageDeleteCookie(cookieStorage, [cookie _GetInternalCFHTTPCookie]); 67 63 } 68 69 #if !USE(CFURLCONNECTION)70 64 71 65 static NSArray *httpCookiesForURL(CFHTTPCookieStorageRef cookieStorage, NSURL *firstParty, NSURL *url) … … 349 343 } 350 344 351 #endif // !USE(CFURLCONNECTION)352 353 345 void deleteCookiesForHostnames(const NetworkStorageSession& session, const Vector<String>& hostnames) 354 346 { -
trunk/Source/WebCore/platform/network/mac/CredentialStorageMac.mm
r213125 r224846 27 27 #include "CredentialStorage.h" 28 28 29 #if !USE(CFURLCONNECTION)30 31 29 #include "AuthenticationMac.h" 32 30 #include "Credential.h" … … 42 40 43 41 } // namespace WebCore 44 45 #endif // !USE(CFURLCONNECTION) -
trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.h
r218517 r224846 29 29 #pragma once 30 30 31 #if !USE(CFURLCONNECTION)32 33 31 #include <wtf/Forward.h> 34 32 #include <wtf/RetainPtr.h> … … 48 46 49 47 } // namespace WebCore 50 51 #endif // !USE(CFURLCONNECTION) -
trunk/Source/WebCore/platform/network/mac/FormDataStreamMac.mm
r220243 r224846 30 30 #import "FormDataStreamMac.h" 31 31 32 #if !USE(CFURLCONNECTION)33 34 32 #import "FormDataStreamCFNet.h" 35 33 #import <pal/spi/cf/CFNetworkSPI.h> … … 53 51 54 52 } // namespace WebCore 55 56 #endif // !USE(CFURLCONNECTION) -
trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm
r224395 r224846 31 31 #import <Foundation/Foundation.h> 32 32 #import <wtf/BlockObjCExceptions.h> 33 34 #if PLATFORM(IOS) && USE(CFURLCONNECTION) && USE(APPLE_INTERNAL_SDK)35 #import <CFNetwork/CFSocketStreamPriv.h>36 #endif37 38 #if USE(CFURLCONNECTION)39 extern "C" {40 const CFStringRef _kCFStreamPropertySSLClientCertificates;41 const CFStringRef _kCFStreamPropertySSLClientCertificateState;42 }43 #endif44 33 45 34 @interface NSError (WebExtras) … … 99 88 @end 100 89 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 NSURLErrorDomain108 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 push142 #pragma clang diagnostic ignored "-Wdeprecated-declarations"143 if (userInfo && (values[count] = (id)CFDictionaryGetValue(userInfo, kCFStreamPropertySSLPeerCertificates)) != nil) {144 // Need to translate the cert145 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 pop161 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 180 90 #endif // PLATFORM(IOS) 181 91 … … 197 107 return adoptNS([[NSError alloc] initWithDomain:resourceError.domain() code:resourceError.errorCode() userInfo:userInfo.get()]); 198 108 } 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() const212 {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 #endif232 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 *() const241 {242 return nsError();243 }244 245 #else246 109 247 110 ResourceError::ResourceError(NSError *nsError) … … 317 180 } 318 181 319 #endif // USE(CFURLCONNECTION)320 321 182 } // namespace WebCore -
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
r224373 r224846 56 56 #import <wtf/text/CString.h> 57 57 58 #if USE(CFURLCONNECTION)59 #if USE(APPLE_INTERNAL_SDK)60 #import <CFNetwork/CFURLConnectionPriv.h>61 #endif62 typedef struct _CFURLConnection* CFURLConnectionRef;63 extern "C" {64 CFDictionaryRef _CFURLConnectionCopyTimingData(CFURLConnectionRef);65 }66 #endif // USE(CFURLCONNECTION)67 68 58 #if PLATFORM(IOS) 69 59 #import "RuntimeApplicationChecks.h" … … 78 68 79 69 namespace WebCore { 80 81 #if !USE(CFURLCONNECTION)82 70 83 71 static void applyBasicAuthorizationHeader(ResourceRequest& request, const Credential& credential) … … 114 102 static bool synchronousWillSendRequestEnabled() 115 103 { 116 #if PLATFORM(IOS)117 104 static bool disabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisableSynchronousWillSendRequestPreferenceKey"] || IOSApplication::isIBooks(); 118 #else119 static bool disabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisableSynchronousWillSendRequestPreferenceKey"];120 #endif121 122 105 return !disabled; 123 106 } … … 321 304 } 322 305 323 #if !USE(CFURLCONNECTION)324 325 306 void ResourceHandle::schedule(SchedulePair& pair) 326 307 { … … 336 317 [d->m_connection.get() unscheduleFromRunLoop:runLoop forMode:(NSString *)pair.mode()]; 337 318 } 338 339 #endif340 319 341 320 id ResourceHandle::makeDelegate(bool shouldUseCredentialStorage, MessageQueue<Function<void()>>* queue) … … 690 669 } 691 670 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 #else702 703 671 void ResourceHandle::getConnectionTimingData(NSURLConnection *connection, NetworkLoadMetrics& timing) 704 672 { … … 706 674 } 707 675 708 #endif709 710 676 } // namespace WebCore -
trunk/Source/WebCore/platform/network/mac/SynchronousLoaderClient.mm
r207585 r224846 27 27 #include "SynchronousLoaderClient.h" 28 28 29 #if !USE(CFURLCONNECTION)30 31 29 #include "AuthenticationChallenge.h" 32 30 … … 39 37 } 40 38 41 #if !USE(CFURLCONNECTION)42 39 ResourceError SynchronousLoaderClient::platformBadResponseError() 43 40 { … … 45 42 return error.get(); 46 43 } 47 #endif48 44 49 45 } 50 51 #endif // !USE(CFURLCONNECTION) -
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h
r224373 r224846 25 25 26 26 #pragma once 27 28 #if !USE(CFURLCONNECTION)29 27 30 28 #include <dispatch/dispatch.h> … … 58 56 59 57 @end 60 61 #endif // !USE(CFURLCONNECTION) -
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
r224687 r224846 27 27 #import "WebCoreResourceHandleAsOperationQueueDelegate.h" 28 28 29 #if !USE(CFURLCONNECTION)30 31 29 #import "AuthenticationChallenge.h" 32 30 #import "AuthenticationMac.h" … … 359 357 360 358 @end 361 362 #endif // !USE(CFURLCONNECTION)363 -
trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm
r224698 r224846 328 328 #endif 329 329 330 #if !USE(CFURLCONNECTION)331 330 NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentRequest, NSURLRequest *newRequest, NSURLResponse *redirectResponse) 332 331 { … … 342 341 return [[[NSHTTPURLResponse alloc] initWithURL:[currentRequest URL] statusCode:302 HTTPVersion:(NSString *)kCFHTTPVersion1_1 headerFields:synthesizedResponseHeaderFields] autorelease]; 343 342 } 344 #endif345 343 346 344 } -
trunk/Source/WebKit/ChangeLog
r224841 r224846 1 2017-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 1 10 2017-11-14 Daniel Bates <dabates@apple.com> 2 11 -
trunk/Source/WebKit/NetworkProcess/Downloads/Download.h
r224828 r224846 152 152 RetainPtr<WKDownloadAsDelegate> m_delegate; 153 153 #endif 154 #if USE(CFURLCONNECTION)155 RetainPtr<CFURLDownloadRef> m_download;156 #endif157 154 std::unique_ptr<WebCore::ResourceHandleClient> m_downloadClient; 158 155 RefPtr<WebCore::ResourceHandle> m_resourceHandle; -
trunk/Source/WebKitLegacy/ChangeLog
r224629 r224846 1 2017-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 1 11 2017-11-06 Per Arne Vollan <pvollan@apple.com> 2 12 -
trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp
r224522 r224846 149 149 host->schedule(resourceLoader, priority); 150 150 151 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)151 #if PLATFORM(COCOA) 152 152 if (ResourceRequest::resourcePrioritiesEnabled() && !isSuspendingPendingRequests()) { 153 153 // Serve all requests at once to keep the pipeline full at the network layer. -
trunk/Source/WebKitLegacy/mac/ChangeLog
r224841 r224846 1 2017-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 1 18 2017-11-14 Daniel Bates <dabates@apple.com> 2 19 -
trunk/Source/WebKitLegacy/mac/Misc/WebDownload.mm
r220506 r224846 30 30 31 31 #import <Foundation/NSURLAuthenticationChallenge.h> 32 #import <WebCore/AuthenticationCF.h>33 32 #import <WebCore/AuthenticationMac.h> 34 33 #import <WebCore/Credential.h> … … 40 39 41 40 #import "WebTypesInternal.h" 42 43 #if USE(CFURLCONNECTION)44 #import <CFNetwork/CFNetwork.h>45 #import <CFNetwork/CFURLConnection.h>46 #endif47 41 48 42 using namespace WebCore; … … 62 56 directory:(NSString *)directory; 63 57 64 #if USE(CFURLCONNECTION)65 - (id)_initWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy;66 #endif67 68 58 @end 69 59 … … 228 218 } 229 219 230 #if USE(CFURLCONNECTION)231 - (id)_initWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(NSURLConnectionDelegateProxy *)proxy232 {233 [self _setRealDelegate:delegate];234 return [super _initWithLoadingCFURLConnection:connection request:request response:response delegate:_webInternal proxy:proxy];235 }236 #endif237 238 220 - (id)_initWithRequest:(NSURLRequest *)request 239 221 delegate:(id)delegate -
trunk/Source/WebKitLegacy/mac/Misc/WebDownloadInternal.h
r207585 r224846 28 28 29 29 #import <WebKitLegacy/WebDownload.h> 30 31 #if USE(CFURLCONNECTION)32 #import <CFNetwork/CFURLConnection.h>33 #endif34 30 35 31 @interface WebDownload (WebDownloadCreation) … … 38 34 +(id)_downloadWithRequest:(NSURLRequest *)request delegate:(id)delegate directory:(NSString *)directory; 39 35 40 #if USE(CFURLCONNECTION)41 + (id)_downloadWithLoadingCFURLConnection:(CFURLConnectionRef)connection request:(CFURLRequestRef)request response:(CFURLResponseRef)response delegate:(id)delegate proxy:(id)proxy;42 #endif43 44 36 @end -
trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm
r222896 r224846 38 38 #import "WebView.h" 39 39 #import "WebViewInternal.h" 40 #import <WebCore/AuthenticationCF.h>41 40 #import <WebCore/AuthenticationMac.h> 42 41 #import <WebCore/BitmapImage.h> -
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
r223981 r224846 74 74 #import "WebViewInternal.h" 75 75 #import <JavaScriptCore/JSContextInternal.h> 76 #import <WebCore/AuthenticationCF.h>77 76 #import <WebCore/AuthenticationMac.h> 78 77 #import <WebCore/BackForwardController.h> … … 321 320 ResourceHandle* handle = mainResourceLoader->handle(); 322 321 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 #else328 322 [WebDownload _downloadWithLoadingConnection:handle->connection() request:request.nsURLRequest(UpdateHTTPBody) response:response.nsURLResponse() delegate:[webView downloadDelegate] proxy:nil]; 329 #endif330 323 } 331 324 -
trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
r224833 r224846 1868 1868 { 1869 1869 RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage(); 1870 ASSERT(cookieStorage); // Will fail when building without USE(CFURLCONNECTION) andNetworkStorageSession::switchToNewTestingSession() was not called beforehand.1870 ASSERT(cookieStorage); // Will fail when NetworkStorageSession::switchToNewTestingSession() was not called beforehand. 1871 1871 CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy); 1872 1872 } -
trunk/Source/WebKitLegacy/mac/WebView/WebView.mm
r224833 r224846 7458 7458 - (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode 7459 7459 { 7460 #if USE(CFURLCONNECTION)7461 CFRunLoopRef schedulePairRunLoop = [runLoop getCFRunLoop];7462 #else7463 NSRunLoop *schedulePairRunLoop = runLoop;7464 #endif7465 7460 if (runLoop && mode) 7466 core(self)->addSchedulePair(SchedulePair::create( schedulePairRunLoop, (CFStringRef)mode));7461 core(self)->addSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode)); 7467 7462 } 7468 7463 7469 7464 - (void)unscheduleFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode 7470 7465 { 7471 #if USE(CFURLCONNECTION)7472 CFRunLoopRef schedulePairRunLoop = [runLoop getCFRunLoop];7473 #else7474 NSRunLoop *schedulePairRunLoop = runLoop;7475 #endif7476 7466 if (runLoop && mode) 7477 core(self)->removeSchedulePair(SchedulePair::create( schedulePairRunLoop, (CFStringRef)mode));7467 core(self)->removeSchedulePair(SchedulePair::create(runLoop, (CFStringRef)mode)); 7478 7468 } 7479 7469
Note:
See TracChangeset
for help on using the changeset viewer.