Changeset 224828 in webkit


Ignore:
Timestamp:
Nov 14, 2017 11:54:01 AM (6 years ago)
Author:
achristensen@apple.com
Message:

Remove WebKit CFURLConnection code
​https://bugs.webkit.org/show_bug.cgi?id=179645

Reviewed by Alexey Proskuryakov.

The CFURLConnection code is Windows-specific now. Nobody can use it in modern WebKit.

  • NetworkProcess/Downloads/Download.h:
  • NetworkProcess/Downloads/mac/DownloadMac.mm:
  • NetworkProcess/NetworkLoad.h:
  • NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:

(WebKit::serverTrustCredential):

  • NetworkProcess/mac/NetworkLoadMac.mm:
  • Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::useCredentialForSingleChallenge):
(WebKit::AuthenticationManager::continueWithoutCredentialForSingleChallenge):
(WebKit::AuthenticationManager::cancelSingleChallenge):
(WebKit::AuthenticationManager::performDefaultHandlingForSingleChallenge):
(WebKit::AuthenticationManager::rejectProtectionSpaceAndContinueForSingleChallenge):

  • Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm:
  • Shared/Authentication/mac/AuthenticationManager.mac.mm:

(WebKit::AuthenticationManager::tryUseCertificateInfoForChallenge):

  • Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

  • Shared/WebProcessCreationParameters.h:
  • Shared/mac/WebCoreArgumentCodersMac.mm:

(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):

  • config.h:
Location:
trunk/Source/WebKit
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r224827 r224828  
     12017-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
    1342017-11-14  Alex Christensen  <achristensen@webkit.org>
    235

  • trunk/Source/WebKit/NetworkProcess/Downloads/Download.h

    r223730 r224828  
    4949#endif
    5050#endif // USE(NETWORK_SESSION)
    51 
    52 #if USE(CFURLCONNECTION)
    53 #include <CFNetwork/CFURLDownloadPriv.h>
    54 #endif
    5551
    5652namespace IPC {

  • trunk/Source/WebKit/NetworkProcess/Downloads/mac/DownloadMac.mm

    r222355 r224828  
    3939#import <pal/spi/cocoa/NSURLDownloadSPI.h>
    4040
    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 #else
    78 
    7941@interface WKDownloadAsDelegate : NSObject <NSURLDownloadDelegate> {
    8042    WebKit::Download* _download;
    … …  
    315277@end
    316278
    317 #endif // USE(CFURLCONNECTION)
    318279#endif // !USE(NETWORK_SESSION)

  • trunk/Source/WebKit/NetworkProcess/NetworkLoad.h

    r224373 r224828  
    9090#endif
    9191#if PLATFORM(COCOA)
    92 #if USE(CFURLCONNECTION)
    93     void willCacheResponseAsync(WebCore::ResourceHandle*, CFCachedURLResponseRef) override;
    94 #else
    9592    void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override;
    96 #endif
    9793#endif
    9894#endif // USE(NETWORK_SESSION)

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

    r224371 r224828  
    402402WebCore::Credential serverTrustCredential(const WebCore::AuthenticationChallenge& challenge)
    403403{
    404 #if USE(CFURLCONNECTION)
    405     notImplemented();
    406     return { };
    407 #else
    408404    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  
    3636using namespace WebCore;
    3737
    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 #else
    48 
    4938void NetworkLoad::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse)
    5039{
    … …  
    5443}
    5544
    56 #endif // !USE(CFURLCONNECTION)
    57 
    5845} // namespace WebKit
    5946

  • trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp

    r223993 r224828  
    232232    if (coreClient)
    233233        coreClient->receivedCredential(challenge.challenge, credential);
    234 #if !USE(CFURLCONNECTION) && !USE(NETWORK_SESSION)
     234#if !USE(NETWORK_SESSION)
    235235    else
    236236        receivedCredential(challenge.challenge, credential);
    … …  
    263263    if (coreClient)
    264264        coreClient->receivedRequestToContinueWithoutCredential(challenge.challenge);
    265 #if !USE(CFURLCONNECTION) && !USE(NETWORK_SESSION)
     265#if !USE(NETWORK_SESSION)
    266266    else
    267267        receivedRequestToContinueWithoutCredential(challenge.challenge);
    … …  
    294294    if (coreClient)
    295295        coreClient->receivedCancellation(challenge.challenge);
    296 #if !USE(CFURLCONNECTION) && !USE(NETWORK_SESSION)
     296#if !USE(NETWORK_SESSION)
    297297    else
    298298        receivedCancellation(challenge.challenge);
    … …  
    325325    if (coreClient)
    326326        coreClient->receivedRequestToPerformDefaultHandling(challenge.challenge);
    327 #if !USE(CFURLCONNECTION) && !USE(NETWORK_SESSION)
     327#if !USE(NETWORK_SESSION)
    328328    else
    329329        receivedRequestToPerformDefaultHandling(challenge.challenge);
    … …  
    356356    if (coreClient)
    357357        coreClient->receivedChallengeRejection(challenge.challenge);
    358 #if !USE(CFURLCONNECTION) && !USE(NETWORK_SESSION)
     358#if !USE(NETWORK_SESSION)
    359359    else
    360360        receivedChallengeRejection(challenge.challenge);

  • trunk/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm

    r223993 r224828  
    2727#import "AuthenticationManager.h"
    2828
    29 #if !USE(CFURLCONNECTION) && !USE(NETWORK_SESSION)
     29#if !USE(NETWORK_SESSION)
    3030using namespace WebCore;
    3131

  • trunk/Source/WebKit/Shared/Authentication/mac/AuthenticationManager.mac.mm

    r221059 r224828  
    8282        if (completionHandler)
    8383            completionHandler(AuthenticationChallengeDisposition::Cancel, { });
    84         else {
    85 #if USE(CFURLCONNECTION)
    86             notImplemented();
    87 #else
     84        else
    8885            [challenge.sender() cancelAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()];
    89 #endif
    90         }
    9186        return true;
    9287    }
    … …  
    9590    if (completionHandler)
    9691        completionHandler(AuthenticationChallengeDisposition::UseCredential, Credential(credential));
    97     else {
    98 #if USE(CFURLCONNECTION)
    99         notImplemented();
    100 #else
     92    else
    10193        [challenge.sender() useCredential:credential forAuthenticationChallenge:challenge.nsURLAuthenticationChallenge()];
    102 #endif
    103     }
    10494    return true;
    10595}

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

    r220780 r224828  
    9696    encoder << fullKeyboardAccessEnabled;
    9797    encoder << defaultRequestTimeoutInterval;
    98 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
     98#if PLATFORM(COCOA)
    9999    encoder << uiProcessBundleIdentifier;
    100100#endif
    … …  
    245245    if (!decoder.decode(parameters.defaultRequestTimeoutInterval))
    246246        return false;
    247 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
     247#if PLATFORM(COCOA)
    248248    if (!decoder.decode(parameters.uiProcessBundleIdentifier))
    249249        return false;

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

    r223270 r224828  
    134134    TextCheckerState textCheckerState;
    135135
    136 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
     136#if PLATFORM(COCOA)
    137137    String uiProcessBundleIdentifier;
    138138#endif

  • trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm

    r224267 r224828  
    4040#import <pal/spi/cf/CFNetworkSPI.h>
    4141
    42 #if USE(CFURLCONNECTION)
    43 #import <CFNetwork/CFURLRequest.h>
    44 #endif
    45 
    4642#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    4743#import <WebCore/MediaPlaybackTargetContext.h>
    … …  
    174170}
    175171
    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 #else
    208 
    209172static RetainPtr<CFDictionaryRef> createSerializableRepresentation(NSURLRequest *request, CFTypeRef tokenNull)
    210173{
    … …  
    247210    encoder.encodeEnum(resourceRequest.cachePolicy());
    248211}
    249 #endif
    250212
    251213bool ArgumentCoder<ResourceRequest>::decodePlatformData(Decoder& decoder, ResourceRequest& resourceRequest)
    … …  
    264226        return false;
    265227
    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 #else
    273228    RetainPtr<NSURLRequest> nsURLRequest = createNSURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef());
    274229    if (!nsURLRequest)
    … …  
    276231
    277232    resourceRequest = ResourceRequest(nsURLRequest.get());
    278 #endif
    279233   
    280234    Vector<String> responseContentDispositionEncodingFallbackArray;

  • trunk/Source/WebKit/config.h

    r223179 r224828  
    7979#endif
    8080
    81 #if USE(CFURLCONNECTION)
    82 #ifndef USE_NETWORK_SESSION
    83 #define USE_NETWORK_SESSION 0
    84 #endif
    85 #endif
    86 
    8781#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) || USE(SOUP)
    8882#ifndef USE_NETWORK_SESSION
Note: See TracChangeset for help on using the changeset viewer.