Changeset 215280 in webkit


Ignore:
Timestamp:
Apr 12, 2017, 12:40:58 PM (8 years ago)
Author:
achristensen@apple.com
Message:

Stop using didReceiveDataArray callback on El Capitan
​https://bugs.webkit.org/show_bug.cgi?id=170780

Reviewed by Brady Eidson.

Source/WebCore:

didReceiveDataArray was an optimization that improved performance on iOS but is not needed any more.
The only platform where this is used is El Capitan, and didReceiveData works fine on that platform.
I've left some cleanup still to be done in SharedBuffer, and doing that is the motivation for this change.

  • WebCore.xcodeproj/project.pbxproj:
  • loader/ResourceLoader.h:
  • loader/SubresourceLoader.h:
  • loader/cf/SubresourceLoaderCF.cpp: Removed.
  • loader/mac/ResourceLoaderMac.mm:

(WebCore::ResourceLoader::didReceiveDataArray): Deleted.

  • platform/network/ResourceHandleClient.h:

(WebCore::ResourceHandleClient::supportsDataArray): Deleted.
(WebCore::ResourceHandleClient::didReceiveDataArray): Deleted.

  • platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:

(WebCore::ResourceHandleCFURLConnectionDelegate::makeConnectionClient):
(WebCore::ResourceHandleCFURLConnectionDelegate::didReceiveDataArrayCallback): Deleted.

  • platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
  • platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:

(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray): Deleted.

  • platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h:
  • platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:

(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray): Deleted.

  • platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h:
  • platform/network/mac/WebCoreResourceHandleAsDelegate.mm:

(-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]): Deleted.

  • platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:

(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveDataArray:]): Deleted.

Source/WebKit2:

  • NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::supportsDataArray): Deleted.
(WebKit::NetworkLoad::didReceiveDataArray): Deleted.

  • NetworkProcess/NetworkLoad.h:
Location:
trunk/Source
Files:
1 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r215277 r215280  
     12017-04-12  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop using didReceiveDataArray callback on El Capitan
     4        https://bugs.webkit.org/show_bug.cgi?id=170780
     5
     6        Reviewed by Brady Eidson.
     7
     8        didReceiveDataArray was an optimization that improved performance on iOS but is not needed any more.
     9        The only platform where this is used is El Capitan, and didReceiveData works fine on that platform.
     10        I've left some cleanup still to be done in SharedBuffer, and doing that is the motivation for this change.
     11
     12        * WebCore.xcodeproj/project.pbxproj:
     13        * loader/ResourceLoader.h:
     14        * loader/SubresourceLoader.h:
     15        * loader/cf/SubresourceLoaderCF.cpp: Removed.
     16        * loader/mac/ResourceLoaderMac.mm:
     17        (WebCore::ResourceLoader::didReceiveDataArray): Deleted.
     18        * platform/network/ResourceHandleClient.h:
     19        (WebCore::ResourceHandleClient::supportsDataArray): Deleted.
     20        (WebCore::ResourceHandleClient::didReceiveDataArray): Deleted.
     21        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
     22        (WebCore::ResourceHandleCFURLConnectionDelegate::makeConnectionClient):
     23        (WebCore::ResourceHandleCFURLConnectionDelegate::didReceiveDataArrayCallback): Deleted.
     24        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.h:
     25        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
     26        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray): Deleted.
     27        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h:
     28        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
     29        (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray): Deleted.
     30        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h:
     31        * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
     32        (-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]): Deleted.
     33        * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
     34        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveDataArray:]): Deleted.
     35
    1362017-04-12  Beth Dakin  <bdakin@apple.com>
    237

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r215254 r215280  
    32263226                7D4C96DD1AD4483500365A50 /* JSFetchHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D4C96D91AD4483500365A50 /* JSFetchHeaders.h */; };
    32273227                7D741BDA177226AA00859170 /* CSSValueKeywords.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 6565814809D13043000E61D7 /* CSSValueKeywords.h */; };
    3228                 7E37EF2E1339208800B29250 /* SubresourceLoaderCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E37EF2D1339208800B29250 /* SubresourceLoaderCF.cpp */; };
    32293228                7E428CE513E3407F003B661C /* ResourceHandleIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */; };
    32303229                7E46F6FA1627A2CA00062223 /* JSOESElementIndexUint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */; };
    … …  
    1122811227                7D4C96D81AD4483500365A50 /* JSFetchHeaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFetchHeaders.cpp; sourceTree = "<group>"; };
    1122911228                7D4C96D91AD4483500365A50 /* JSFetchHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFetchHeaders.h; sourceTree = "<group>"; };
    11230                 7E37EF2D1339208800B29250 /* SubresourceLoaderCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubresourceLoaderCF.cpp; sourceTree = "<group>"; };
    1123111229                7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleIOS.mm; sourceTree = "<group>"; };
    1123211230                7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESElementIndexUint.cpp; sourceTree = "<group>"; };
    … …  
    1965219650                        children = (
    1965319651                                7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */,
    19654                                 7E37EF2D1339208800B29250 /* SubresourceLoaderCF.cpp */,
    1965519652                        );
    1965619653                        path = cf;
    … …  
    3309733094                                F55B3DD31251F12D003EF269 /* SubmitInputType.cpp in Sources */,
    3309833095                                93E227E40AF589AD00D48324 /* SubresourceLoader.cpp in Sources */,
    33099                                 7E37EF2E1339208800B29250 /* SubresourceLoaderCF.cpp in Sources */,
    3310033096                                7E8FADC4199A95B100714968 /* SubresourceLoaderCocoa.mm in Sources */,
    3310133097                                5778BD841DA4817B009E3009 /* SubtleCrypto.cpp in Sources */,

  • trunk/Source/WebCore/loader/ResourceLoader.h

    r214266 r215280  
    106106    virtual void didFinishLoading(const NetworkLoadMetrics&);
    107107    virtual void didFail(const ResourceError&);
    108 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    109     virtual void didReceiveDataArray(CFArrayRef dataArray);
    110 #endif
    111108    virtual void didRetrieveDerivedDataFromCache(const String& type, SharedBuffer&);
    112109
    … …  
    197194    void wasBlocked(ResourceHandle*) override;
    198195    void cannotShowURL(ResourceHandle*) override;
    199 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    200     void didReceiveDataArray(ResourceHandle*, CFArrayRef dataArray) override;
    201 #endif
    202196    bool shouldUseCredentialStorage(ResourceHandle*) override { return shouldUseCredentialStorage(); }
    203197    void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) override { didReceiveAuthenticationChallenge(challenge); }

  • trunk/Source/WebCore/loader/SubresourceLoader.h

    r214266 r215280  
    8484#endif
    8585
    86 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    87     bool supportsDataArray() override { return true; }
    88     void didReceiveDataArray(CFArrayRef) override;
    89 #endif
    9086    void releaseResources() override;
    9187

  • trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm

    r207585 r215280  
    5959#endif
    6060
    61 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    62 
    63 void ResourceLoader::didReceiveDataArray(CFArrayRef dataArray)
    64 {
    65     // Protect this in this delegate method since the additional processing can do
    66     // anything including possibly derefing this; one example of this is Radar 3266216.
    67     Ref<ResourceLoader> protectedThis(*this);
    68 
    69     CFIndex arrayCount = CFArrayGetCount(dataArray);
    70     for (CFIndex i = 0; i < arrayCount; ++i) {
    71         CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, i));
    72         unsigned dataLen = static_cast<unsigned>(CFDataGetLength(data));
    73 
    74         if (m_options.dataBufferingPolicy == BufferData) {
    75             if (!m_resourceData)
    76                 m_resourceData = SharedBuffer::create();
    77             m_resourceData->append(data);
    78         }
    79 
    80         // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
    81         // However, with today's computers and networking speeds, this won't happen in practice.
    82         // Could be an issue with a giant local file.
    83         if (m_options.sendLoadCallbacks == SendCallbacks && m_frame)
    84             frameLoader()->notifier().didReceiveData(this, reinterpret_cast<const char*>(CFDataGetBytePtr(data)), dataLen, dataLen);
    85     }
    8661}
    87 
    88 void ResourceLoader::didReceiveDataArray(ResourceHandle*, CFArrayRef dataArray)
    89 {
    90     CFIndex arrayCount = CFArrayGetCount(dataArray);
    91     CFIndex dataLength = 0;
    92     for (CFIndex i = 0; i < arrayCount; ++i) {
    93         CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, i));
    94         dataLength += CFDataGetLength(data);
    95     }
    96 
    97     didReceiveDataArray(dataArray);
    98 }
    99 
    100 #endif
    101 
    102 }

  • trunk/Source/WebCore/platform/network/ResourceHandleClient.h

    r212993 r215280  
    4343
    4444namespace WebCore {
    45     class AuthenticationChallenge;
    46     class Credential;
    47     class URL;
    48     class ProtectionSpace;
    49     class ResourceHandle;
    50     class ResourceError;
    51     class ResourceRequest;
    52     class ResourceResponse;
    53     class SharedBuffer;
     45class AuthenticationChallenge;
     46class Credential;
     47class URL;
     48class ProtectionSpace;
     49class ResourceHandle;
     50class ResourceError;
     51class ResourceRequest;
     52class ResourceResponse;
     53class SharedBuffer;
    5454
    55     enum CacheStoragePolicy {
    56         StorageAllowed,
    57         StorageAllowedInMemoryOnly,
    58         StorageNotAllowed
    59     };
     55enum CacheStoragePolicy {
     56    StorageAllowed,
     57    StorageAllowedInMemoryOnly,
     58    StorageNotAllowed
     59};
     60
     61class ResourceHandleClient {
     62public:
     63    WEBCORE_EXPORT ResourceHandleClient();
     64    WEBCORE_EXPORT virtual ~ResourceHandleClient();
     65
     66    WEBCORE_EXPORT virtual ResourceRequest willSendRequest(ResourceHandle*, ResourceRequest&&, ResourceResponse&&);
     67    virtual void didSendData(ResourceHandle*, unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/) { }
     68
     69    virtual void didReceiveResponse(ResourceHandle*, ResourceResponse&&) { }
    6070   
    61     class ResourceHandleClient {
    62     public:
    63         WEBCORE_EXPORT ResourceHandleClient();
    64         WEBCORE_EXPORT virtual ~ResourceHandleClient();
     71    virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) { }
     72    WEBCORE_EXPORT virtual void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&&, int encodedDataLength);
     73   
     74    virtual void didFinishLoading(ResourceHandle*) { }
     75    virtual void didFail(ResourceHandle*, const ResourceError&) { }
     76    virtual void wasBlocked(ResourceHandle*) { }
     77    virtual void cannotShowURL(ResourceHandle*) { }
    6578
    66         WEBCORE_EXPORT virtual ResourceRequest willSendRequest(ResourceHandle*, ResourceRequest&&, ResourceResponse&&);
    67         virtual void didSendData(ResourceHandle*, unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/) { }
     79    virtual bool usesAsyncCallbacks() { return false; }
    6880
    69         virtual void didReceiveResponse(ResourceHandle*, ResourceResponse&&) { }
    70        
    71         virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) { }
    72         WEBCORE_EXPORT virtual void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&&, int encodedDataLength);
    73        
    74         virtual void didFinishLoading(ResourceHandle*) { }
    75         virtual void didFail(ResourceHandle*, const ResourceError&) { }
    76         virtual void wasBlocked(ResourceHandle*) { }
    77         virtual void cannotShowURL(ResourceHandle*) { }
     81    virtual bool loadingSynchronousXHR() { return false; }
    7882
    79         virtual bool usesAsyncCallbacks() { return false; }
     83    // Client will pass an updated request using ResourceHandle::continueWillSendRequest() when ready.
     84    WEBCORE_EXPORT virtual void willSendRequestAsync(ResourceHandle*, ResourceRequest&&, ResourceResponse&&);
    8085
    81         virtual bool loadingSynchronousXHR() { return false; }
    82 
    83         // Client will pass an updated request using ResourceHandle::continueWillSendRequest() when ready.
    84         WEBCORE_EXPORT virtual void willSendRequestAsync(ResourceHandle*, ResourceRequest&&, ResourceResponse&&);
    85 
    86         // Client will call ResourceHandle::continueDidReceiveResponse() when ready.
    87         WEBCORE_EXPORT virtual void didReceiveResponseAsync(ResourceHandle*, ResourceResponse&&);
     86    // Client will call ResourceHandle::continueDidReceiveResponse() when ready.
     87    WEBCORE_EXPORT virtual void didReceiveResponseAsync(ResourceHandle*, ResourceResponse&&);
    8888
    8989#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    90         // Client will pass an updated request using ResourceHandle::continueCanAuthenticateAgainstProtectionSpace() when ready.
    91         WEBCORE_EXPORT virtual void canAuthenticateAgainstProtectionSpaceAsync(ResourceHandle*, const ProtectionSpace&);
     90    // Client will pass an updated request using ResourceHandle::continueCanAuthenticateAgainstProtectionSpace() when ready.
     91    WEBCORE_EXPORT virtual void canAuthenticateAgainstProtectionSpaceAsync(ResourceHandle*, const ProtectionSpace&);
    9292#endif
    93         // Client will pass an updated request using ResourceHandle::continueWillCacheResponse() when ready.
     93    // Client will pass an updated request using ResourceHandle::continueWillCacheResponse() when ready.
    9494#if USE(CFURLCONNECTION)
    95         WEBCORE_EXPORT virtual void willCacheResponseAsync(ResourceHandle*, CFCachedURLResponseRef);
     95    WEBCORE_EXPORT virtual void willCacheResponseAsync(ResourceHandle*, CFCachedURLResponseRef);
    9696#elif PLATFORM(COCOA)
    97         WEBCORE_EXPORT virtual void willCacheResponseAsync(ResourceHandle*, NSCachedURLResponse *);
    98 #endif
    99 
    100 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    101         virtual bool supportsDataArray() { return false; }
    102         virtual void didReceiveDataArray(ResourceHandle*, CFArrayRef) { }
     97    WEBCORE_EXPORT virtual void willCacheResponseAsync(ResourceHandle*, NSCachedURLResponse *);
    10398#endif
    10499
    105100#if USE(SOUP)
    106         virtual char* getOrCreateReadBuffer(size_t /*requestedLength*/, size_t& /*actualLength*/) { return 0; }
     101    virtual char* getOrCreateReadBuffer(size_t /*requestedLength*/, size_t& /*actualLength*/) { return 0; }
    107102#endif
    108103
    109         virtual bool shouldUseCredentialStorage(ResourceHandle*) { return false; }
    110         virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
     104    virtual bool shouldUseCredentialStorage(ResourceHandle*) { return false; }
     105    virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
    111106#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    112         virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&) { return false; }
     107    virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&) { return false; }
    113108#endif
    114         virtual void receivedCancellation(ResourceHandle*, const AuthenticationChallenge&) { }
     109    virtual void receivedCancellation(ResourceHandle*, const AuthenticationChallenge&) { }
    115110
    116111#if PLATFORM(IOS) || USE(CFURLCONNECTION)
    117         virtual RetainPtr<CFDictionaryRef> connectionProperties(ResourceHandle*) { return nullptr; }
     112    virtual RetainPtr<CFDictionaryRef> connectionProperties(ResourceHandle*) { return nullptr; }
    118113#endif
    119114
    120115#if USE(CFURLCONNECTION)
    121         virtual CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef response) { return response; }
     116    virtual CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef response) { return response; }
    122117#if PLATFORM(WIN)
    123         virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
     118    virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
    124119#endif // PLATFORM(WIN)
    125120
    126121#elif PLATFORM(COCOA)
    127         virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
     122    virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
    128123#endif
    129     };
     124};
    130125
    131126}

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp

    r207585 r215280  
    122122#endif // USE(PROTECTION_SPACE_AUTH_CALLBACK)
    123123
    124 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    125 void ResourceHandleCFURLConnectionDelegate::didReceiveDataArrayCallback(CFURLConnectionRef, CFArrayRef dataArray, const void* clientInfo)
    126 {
    127     static_cast<ResourceHandleCFURLConnectionDelegate*>(const_cast<void*>(clientInfo))->didReceiveDataArray(dataArray);
    128 }
    129 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    130 
    131124RetainPtr<CFURLResponseRef> ResourceHandleCFURLConnectionDelegate::synthesizeRedirectResponseIfNecessary(CFURLRequestRef newRequest, CFURLResponseRef cfRedirectResponse)
    132125{
    … …  
    208201#endif
    209202        0,
    210 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    211         &ResourceHandleCFURLConnectionDelegate::didReceiveDataArrayCallback
    212 #else
    213203        0
    214 #endif
    215204    };
    216205    return client;

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.h

    r207151 r215280  
    7373    static Boolean canRespondToProtectionSpaceCallback(CFURLConnectionRef, CFURLProtectionSpaceRef, const void* clientInfo);
    7474#endif // USE(PROTECTION_SPACE_AUTH_CALLBACK)
    75 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    76     static void didReceiveDataArrayCallback(CFURLConnectionRef, CFArrayRef, const void* clientInfo);
    77 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    7875
    7976    virtual CFURLRequestRef willSendRequest(CFURLRequestRef, CFURLResponseRef) = 0;
    … …  
    8986    virtual Boolean canRespondToProtectionSpace(CFURLProtectionSpaceRef) = 0;
    9087#endif // USE(PROTECTION_SPACE_AUTH_CALLBACK)
    91 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    92     virtual void didReceiveDataArray(CFArrayRef dataArray) = 0;
    93 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    9488
    9589protected:

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp

    r212993 r215280  
    304304#endif // USE(PROTECTION_SPACE_AUTH_CALLBACK)
    305305
    306 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    307 void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray(CFArrayRef dataArray)
    308 {
    309     // FIXME: The block implicitly copies protector object, which is wasteful. We should just call ref(),
    310     // capture "this" by pointer value, and use a C++ lambda to prevent other unintentional capturing.
    311     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
    312     CFRetain(dataArray);
    313     dispatch_async(dispatch_get_main_queue(), ^{
    314         if (protectedThis->hasHandle() && m_handle->client()) {
    315             LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
    316 
    317             m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(dataArray), -1);
    318         }
    319         CFRelease(dataArray);
    320     });
    321 }
    322 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    323 
    324306void ResourceHandleCFURLConnectionDelegateWithOperationQueue::continueWillSendRequest(CFURLRequestRef request)
    325307{

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.h

    r207151 r215280  
    5959    Boolean canRespondToProtectionSpace(CFURLProtectionSpaceRef) override;
    6060#endif // USE(PROTECTION_SPACE_AUTH_CALLBACK)
    61 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    62     void didReceiveDataArray(CFArrayRef dataArray) override;
    63 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    6461
    6562    void continueWillSendRequest(CFURLRequestRef) override;

  • trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp

    r212993 r215280  
    273273#endif // USE(PROTECTION_SPACE_AUTH_CALLBACK)
    274274
    275 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    276 void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray(CFArrayRef dataArray)
    277 {
    278     if (!m_handle->client())
    279         return;
    280 
    281     LOG(Network, "CFNet - SynchronousResourceHandleCFURLConnectionDelegate::didReceiveDataArray(handle=%p, arrayLength=%ld) (%s)", m_handle, CFArrayGetCount(dataArray), m_handle->firstRequest().url().string().utf8().data());
    282 
    283     if (ResourceHandleClient* client = m_handle->client())
    284         client->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(dataArray), -1);
    285 }
    286 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    287 
    288275void SynchronousResourceHandleCFURLConnectionDelegate::continueWillSendRequest(CFURLRequestRef)
    289276{

  • trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.h

    r207151 r215280  
    3939    void didFinishLoading() override;
    4040    void didFail(CFErrorRef) override;
    41 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    42     void didReceiveDataArray(CFArrayRef dataArray) override;
    43 #endif // USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    4441
    4542private:

  • trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm

    r212993 r215280  
    154154}
    155155
    156 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    157 - (void)connection:(NSURLConnection *)connection didReceiveDataArray:(NSArray *)dataArray
    158 {
    159     UNUSED_PARAM(connection);
    160     LOG(Network, "Handle %p delegate connection:%p didReceiveDataArray:%p arraySize:%d", m_handle, connection, dataArray, [dataArray count]);
    161 
    162     if (!dataArray)
    163         return;
    164 
    165     if (!m_handle || !m_handle->client())
    166         return;
    167 
    168     m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(reinterpret_cast<CFArrayRef>(dataArray)), -1);
    169     // The call to didReceiveData above can cancel a load, and if so, the delegate (self) could have been deallocated by this point.
    170 }
    171 #endif
    172 
    173156- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data lengthReceived:(long long)lengthReceived
    174157{

  • trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm

    r212993 r215280  
    206206}
    207207
    208 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    209 - (void)connection:(NSURLConnection *)connection didReceiveDataArray:(NSArray *)dataArray
    210 {
    211     ASSERT(!isMainThread());
    212     UNUSED_PARAM(connection);
    213 
    214     LOG(Network, "Handle %p delegate connection:%p didReceiveDataArray:%p arraySize:%d", m_handle, connection, dataArray, [dataArray count]);
    215 
    216     dispatch_async(dispatch_get_main_queue(), ^{
    217         if (!dataArray)
    218             return;
    219 
    220         if (!m_handle || !m_handle->client())
    221             return;
    222 
    223         m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(reinterpret_cast<CFArrayRef>(dataArray)), -1);
    224         // The call to didReceiveData above can cancel a load, and if so, the delegate (self) could have been deallocated by this point.
    225     });
    226 }
    227 #endif
    228 
    229208- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data lengthReceived:(long long)lengthReceived
    230209{

  • trunk/Source/WebKit2/ChangeLog

    r215279 r215280  
     12017-04-12  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop using didReceiveDataArray callback on El Capitan
     4        https://bugs.webkit.org/show_bug.cgi?id=170780
     5
     6        Reviewed by Brady Eidson.
     7
     8        * NetworkProcess/NetworkLoad.cpp:
     9        (WebKit::NetworkLoad::supportsDataArray): Deleted.
     10        (WebKit::NetworkLoad::didReceiveDataArray): Deleted.
     11        * NetworkProcess/NetworkLoad.h:
     12
    1132017-04-12  Beth Dakin  <bdakin@apple.com>
    214

  • trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp

    r215152 r215280  
    525525#endif
    526526
    527 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    528 bool NetworkLoad::supportsDataArray()
    529 {
    530     notImplemented();
    531     return false;
    532 }
    533 
    534 void NetworkLoad::didReceiveDataArray(ResourceHandle*, CFArrayRef)
    535 {
    536     ASSERT_NOT_REACHED();
    537     notImplemented();
    538 }
    539 #endif
    540 
    541527void NetworkLoad::didSendData(ResourceHandle* handle, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
    542528{

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

    r215065 r215280  
    8484#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    8585    void canAuthenticateAgainstProtectionSpaceAsync(WebCore::ResourceHandle*, const WebCore::ProtectionSpace&) override;
    86 #endif
    87 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
    88     bool supportsDataArray() override;
    89     void didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef) override;
    9086#endif
    9187#if PLATFORM(COCOA)
Note: See TracChangeset for help on using the changeset viewer.