Changeset 224828 in webkit
- Timestamp:
- Nov 14, 2017 11:54:01 AM (6 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r224827 r224828 1 2017-11-14 Alex Christensen <achristensen@webkit.org> 2 3 Remove WebKit CFURLConnection code 4 https://bugs.webkit.org/show_bug.cgi?id=179645 5 6 Reviewed by Alexey Proskuryakov. 7 8 The CFURLConnection code is Windows-specific now. Nobody can use it in modern WebKit. 9 10 * NetworkProcess/Downloads/Download.h: 11 * NetworkProcess/Downloads/mac/DownloadMac.mm: 12 * NetworkProcess/NetworkLoad.h: 13 * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: 14 (WebKit::serverTrustCredential): 15 * NetworkProcess/mac/NetworkLoadMac.mm: 16 * Shared/Authentication/AuthenticationManager.cpp: 17 (WebKit::AuthenticationManager::useCredentialForSingleChallenge): 18 (WebKit::AuthenticationManager::continueWithoutCredentialForSingleChallenge): 19 (WebKit::AuthenticationManager::cancelSingleChallenge): 20 (WebKit::AuthenticationManager::performDefaultHandlingForSingleChallenge): 21 (WebKit::AuthenticationManager::rejectProtectionSpaceAndContinueForSingleChallenge): 22 * Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm: 23 * Shared/Authentication/mac/AuthenticationManager.mac.mm: 24 (WebKit::AuthenticationManager::tryUseCertificateInfoForChallenge): 25 * Shared/WebProcessCreationParameters.cpp: 26 (WebKit::WebProcessCreationParameters::encode const): 27 (WebKit::WebProcessCreationParameters::decode): 28 * Shared/WebProcessCreationParameters.h: 29 * Shared/mac/WebCoreArgumentCodersMac.mm: 30 (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData): 31 (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData): 32 * config.h: 33 1 34 2017-11-14 Alex Christensen <achristensen@webkit.org> 2 35 -
trunk/Source/WebKit/NetworkProcess/Downloads/Download.h
r223730 r224828 49 49 #endif 50 50 #endif // USE(NETWORK_SESSION) 51 52 #if USE(CFURLCONNECTION)53 #include <CFNetwork/CFURLDownloadPriv.h>54 #endif55 51 56 52 namespace IPC { -
trunk/Source/WebKit/NetworkProcess/Downloads/mac/DownloadMac.mm
r222355 r224828 39 39 #import <pal/spi/cocoa/NSURLDownloadSPI.h> 40 40 41 #if USE(CFURLCONNECTION)42 43 namespace WebKit {44 45 void Download::resume(const IPC::DataReference&, const String&, const SandboxExtension::Handle&)46 {47 notImplemented();48 }49 50 void Download::platformDidFinish()51 {52 notImplemented();53 }54 55 void Download::platformCancelNetworkLoad()56 {57 notImplemented();58 }59 60 void Download::startNetworkLoadWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&)61 {62 notImplemented();63 }64 65 void Download::startNetworkLoad()66 {67 notImplemented();68 }69 70 void Download::platformInvalidate()71 {72 notImplemented();73 }74 75 }76 77 #else78 79 41 @interface WKDownloadAsDelegate : NSObject <NSURLDownloadDelegate> { 80 42 WebKit::Download* _download; … … 315 277 @end 316 278 317 #endif // USE(CFURLCONNECTION)318 279 #endif // !USE(NETWORK_SESSION) -
trunk/Source/WebKit/NetworkProcess/NetworkLoad.h
r224373 r224828 90 90 #endif 91 91 #if PLATFORM(COCOA) 92 #if USE(CFURLCONNECTION)93 void willCacheResponseAsync(WebCore::ResourceHandle*, CFCachedURLResponseRef) override;94 #else95 92 void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override; 96 #endif97 93 #endif 98 94 #endif // USE(NETWORK_SESSION) -
trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
r224371 r224828 402 402 WebCore::Credential serverTrustCredential(const WebCore::AuthenticationChallenge& challenge) 403 403 { 404 #if USE(CFURLCONNECTION)405 notImplemented();406 return { };407 #else408 404 return WebCore::Credential([NSURLCredential credentialForTrust:challenge.nsURLAuthenticationChallenge().protectionSpace.serverTrust]); 409 #endif 410 } 411 412 } 413 414 #endif 405 } 406 407 } 408 409 #endif -
trunk/Source/WebKit/NetworkProcess/mac/NetworkLoadMac.mm
r220243 r224828 36 36 using namespace WebCore; 37 37 38 #if USE(CFURLCONNECTION)39 40 void NetworkLoad::willCacheResponseAsync(ResourceHandle* handle, CFCachedURLResponseRef cfResponse)41 {42 ASSERT_UNUSED(handle, handle == m_handle);43 44 m_handle->continueWillCacheResponse(cfResponse);45 }46 47 #else48 49 38 void NetworkLoad::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse) 50 39 { … … 54 43 } 55 44 56 #endif // !USE(CFURLCONNECTION)57 58 45 } // namespace WebKit 59 46 -
trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp
r223993 r224828 232 232 if (coreClient) 233 233 coreClient->receivedCredential(challenge.challenge, credential); 234 #if !USE( CFURLCONNECTION) && !USE(NETWORK_SESSION)234 #if !USE(NETWORK_SESSION) 235 235 else 236 236 receivedCredential(challenge.challenge, credential); … … 263 263 if (coreClient) 264 264 coreClient->receivedRequestToContinueWithoutCredential(challenge.challenge); 265 #if !USE( CFURLCONNECTION) && !USE(NETWORK_SESSION)265 #if !USE(NETWORK_SESSION) 266 266 else 267 267 receivedRequestToContinueWithoutCredential(challenge.challenge); … … 294 294 if (coreClient) 295 295 coreClient->receivedCancellation(challenge.challenge); 296 #if !USE( CFURLCONNECTION) && !USE(NETWORK_SESSION)296 #if !USE(NETWORK_SESSION) 297 297 else 298 298 receivedCancellation(challenge.challenge); … … 325 325 if (coreClient) 326 326 coreClient->receivedRequestToPerformDefaultHandling(challenge.challenge); 327 #if !USE( CFURLCONNECTION) && !USE(NETWORK_SESSION)327 #if !USE(NETWORK_SESSION) 328 328 else 329 329 receivedRequestToPerformDefaultHandling(challenge.challenge); … … 356 356 if (coreClient) 357 357 coreClient->receivedChallengeRejection(challenge.challenge); 358 #if !USE( CFURLCONNECTION) && !USE(NETWORK_SESSION)358 #if !USE(NETWORK_SESSION) 359 359 else 360 360 receivedChallengeRejection(challenge.challenge); -
trunk/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
r223993 r224828 27 27 #import "AuthenticationManager.h" 28 28 29 #if !USE( CFURLCONNECTION) && !USE(NETWORK_SESSION)29 #if !USE(NETWORK_SESSION) 30 30 using namespace WebCore; 31 31 -
trunk/Source/WebKit/Shared/Authentication/mac/AuthenticationManager.mac.mm
r221059 r224828 82 82 if (completionHandler) 83 83 completionHandler(AuthenticationChallengeDisposition::Cancel, { }); 84 else { 85 #if USE(CFURLCONNECTION) 86 notImplemented(); 87 #else 84 else 88 85 [challenge.sender() cancelAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()]; 89 #endif90 }91 86 return true; 92 87 } … … 95 90 if (completionHandler) 96 91 completionHandler(AuthenticationChallengeDisposition::UseCredential, Credential(credential)); 97 else { 98 #if USE(CFURLCONNECTION) 99 notImplemented(); 100 #else 92 else 101 93 [challenge.sender() useCredential:credential forAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()]; 102 #endif103 }104 94 return true; 105 95 } -
trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp
r220780 r224828 96 96 encoder << fullKeyboardAccessEnabled; 97 97 encoder << defaultRequestTimeoutInterval; 98 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)98 #if PLATFORM(COCOA) 99 99 encoder << uiProcessBundleIdentifier; 100 100 #endif … … 245 245 if (!decoder.decode(parameters.defaultRequestTimeoutInterval)) 246 246 return false; 247 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)247 #if PLATFORM(COCOA) 248 248 if (!decoder.decode(parameters.uiProcessBundleIdentifier)) 249 249 return false; -
trunk/Source/WebKit/Shared/WebProcessCreationParameters.h
r223270 r224828 134 134 TextCheckerState textCheckerState; 135 135 136 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)136 #if PLATFORM(COCOA) 137 137 String uiProcessBundleIdentifier; 138 138 #endif -
trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm
r224267 r224828 40 40 #import <pal/spi/cf/CFNetworkSPI.h> 41 41 42 #if USE(CFURLCONNECTION)43 #import <CFNetwork/CFURLRequest.h>44 #endif45 46 42 #if ENABLE(WIRELESS_PLAYBACK_TARGET) 47 43 #import <WebCore/MediaPlaybackTargetContext.h> … … 174 170 } 175 171 176 #if USE(CFURLCONNECTION)177 void ArgumentCoder<ResourceRequest>::encodePlatformData(Encoder& encoder, const ResourceRequest& resourceRequest)178 {179 RetainPtr<CFURLRequestRef> requestToSerialize = resourceRequest.cfURLRequest(DoNotUpdateHTTPBody);180 181 bool requestIsPresent = requestToSerialize;182 encoder << requestIsPresent;183 184 if (!requestIsPresent)185 return;186 187 // We don't send HTTP body over IPC for better performance.188 // Also, it's not always possible to do, as streams can only be created in process that does networking.189 RetainPtr<CFDataRef> requestHTTPBody = adoptCF(CFURLRequestCopyHTTPRequestBody(requestToSerialize.get()));190 RetainPtr<CFReadStreamRef> requestHTTPBodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(requestToSerialize.get()));191 if (requestHTTPBody || requestHTTPBodyStream) {192 CFMutableURLRequestRef mutableRequest = CFURLRequestCreateMutableCopy(0, requestToSerialize.get());193 requestToSerialize = adoptCF(mutableRequest);194 CFURLRequestSetHTTPRequestBody(mutableRequest, nil);195 CFURLRequestSetHTTPRequestBodyStream(mutableRequest, nil);196 }197 198 RetainPtr<CFDictionaryRef> dictionary = createSerializableRepresentation(requestToSerialize.get(), IPC::tokenNullTypeRef());199 IPC::encode(encoder, dictionary.get());200 201 // The fallback array is part of CFURLRequest, but it is not encoded by WKCFURLRequestCreateSerializableRepresentation.202 encoder << resourceRequest.responseContentDispositionEncodingFallbackArray();203 encoder.encodeEnum(resourceRequest.requester());204 encoder.encodeEnum(resourceRequest.cachePolicy());205 }206 207 #else208 209 172 static RetainPtr<CFDictionaryRef> createSerializableRepresentation(NSURLRequest *request, CFTypeRef tokenNull) 210 173 { … … 247 210 encoder.encodeEnum(resourceRequest.cachePolicy()); 248 211 } 249 #endif250 212 251 213 bool ArgumentCoder<ResourceRequest>::decodePlatformData(Decoder& decoder, ResourceRequest& resourceRequest) … … 264 226 return false; 265 227 266 #if USE(CFURLCONNECTION)267 RetainPtr<CFURLRequestRef> cfURLRequest = createCFURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef());268 if (!cfURLRequest)269 return false;270 271 resourceRequest = ResourceRequest(cfURLRequest.get());272 #else273 228 RetainPtr<NSURLRequest> nsURLRequest = createNSURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef()); 274 229 if (!nsURLRequest) … … 276 231 277 232 resourceRequest = ResourceRequest(nsURLRequest.get()); 278 #endif279 233 280 234 Vector<String> responseContentDispositionEncodingFallbackArray; -
trunk/Source/WebKit/config.h
r223179 r224828 79 79 #endif 80 80 81 #if USE(CFURLCONNECTION)82 #ifndef USE_NETWORK_SESSION83 #define USE_NETWORK_SESSION 084 #endif85 #endif86 87 81 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) || USE(SOUP) 88 82 #ifndef USE_NETWORK_SESSION
Note: See TracChangeset
for help on using the changeset viewer.