Changeset 90834 in webkit

Timestamp:

Jul 12, 2011 11:47:18 AM (13 years ago)

Author:

psolanki@apple.com

Message:

Implement didReceiveDataArray callback for CFNetwork based loader
​https://bugs.webkit.org/show_bug.cgi?id=64130

Reviewed by David Kilzer.

Factor out the didReceiveDataArray code from ResourceHandleMac.mm into
a new method ResourceHandle::handleDataArray(). Implement the callback
in the CFNetwork loader code and call handleDataArray() to process
incoming data.

No new tests because the flag is not enabled for any bots.

• platform/network/ResourceHandle.h:
• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::didReceiveDataArray):
(WebCore::ResourceHandle::createCFURLConnection):
(WebCore::ResourceHandle::handleDataArray):

• platform/network/mac/ResourceHandleMac.mm:

(-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandle.h (modified) (1 diff)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (7 diffs)
• platform/network/mac/ResourceHandleMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-12  Pratik Solanki  <psolanki@apple.com>
+
+        Implement didReceiveDataArray callback for CFNetwork based loader
+        https://bugs.webkit.org/show_bug.cgi?id=64130
+
+        Reviewed by David Kilzer.
+
+        Factor out the didReceiveDataArray code from ResourceHandleMac.mm into
+        a new method ResourceHandle::handleDataArray(). Implement the callback
+        in the CFNetwork loader code and call handleDataArray() to process
+        incoming data.
+
+        No new tests because the flag is not enabled for any bots.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::didReceiveDataArray):
+        (WebCore::ResourceHandle::createCFURLConnection):
+        (WebCore::ResourceHandle::handleDataArray):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):
+
 2011-07-12  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/platform/network/ResourceHandle.h

@@ -212 +212 @@
 #endif
 
+#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+    void handleDataArray(CFArrayRef dataArray);
+#endif
+
 protected:
     ResourceHandle(const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#if USE(CFNETWORK)
-
 #include "ResourceHandleInternal.h"
 
@@ -47 +45 @@
 #include "SharedBuffer.h"
 #include <CFNetwork/CFNetwork.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#include <process.h> // for _beginthread()
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -54 +50 @@
 #include <wtf/Threading.h>
 #include <wtf/text/CString.h>
+
+#if PLATFORM(MAC) && USE(CFNETWORK)
+#include "WebCoreSystemInterface.h"
+#include "WebCoreURLResponse.h"
+#include <CFNetwork/CFURLConnectionPriv.h>
+#endif
+
+#if PLATFORM(WIN)
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#include <process.h>
 
 // FIXME: Remove this declaration once it's in WebKitSupportLibrary.
@@ -63 +69 @@
   CFDictionaryRef properties);
 }
+#endif
 
 namespace WebCore {
+
+#if USE(CFNETWORK)
 
 class WebCoreSynchronousLoaderClient : public ResourceHandleClient {
@@ -205 +214 @@
     handle->client()->didReceiveResponse(handle, cfResponse);
 }
+
+#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+static void didReceiveDataArray(CFURLConnectionRef conn, CFArrayRef dataArray, const void* clientInfo)
+{
+#if LOG_DISABLED
+    UNUSED_PARAM(conn);
+#endif
+    ResourceHandle* handle = static_cast<ResourceHandle*>(const_cast<void*>(clientInfo));
+    if (!handle->client())
+        return;
+
+    LOG(Network, "CFNet - didReceiveDataArray(conn=%p, handle=%p, arrayLength=%ld) (%s)", conn, handle, CFArrayGetCount(dataArray), handle->firstRequest().url().string().utf8().data());
+
+    handle->handleDataArray(dataArray);
+}
+#endif
 
 static void didReceiveData(CFURLConnectionRef conn, CFDataRef data, CFIndex originalLength, const void* clientInfo)
@@ -421 +446 @@
     RetainPtr<CFURLRequestRef> request(AdoptCF, makeFinalRequest(firstRequest(), shouldContentSniff));
 
+#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+    CFURLConnectionClient_V6 client = { 6, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0, 0, 0, didReceiveDataArray};
+#else
     CFURLConnectionClient_V3 client = { 3, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0};
+#endif
     RetainPtr<CFDictionaryRef> connectionProperties(AdoptCF, createConnectionProperties(shouldUseCredentialStorage));
 
@@ -839 +868 @@
 }
 
+#endif // USE(CFNETWORK)
+
+#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+void ResourceHandle::handleDataArray(CFArrayRef dataArray)
+{
+    ASSERT(client());
+    if (client()->supportsDataArray()) {
+        client()->didReceiveDataArray(this, dataArray);
+        return;
+    }
+
+    CFIndex count = CFArrayGetCount(dataArray);
+    ASSERT(count);
+    if (count == 1) {
+        CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, 0));
+        CFIndex length = CFDataGetLength(data);
+        client()->didReceiveData(this, reinterpret_cast<const char*>(CFDataGetBytePtr(data)), length, static_cast<int>(length));
+        return;
+    }
+
+    CFIndex totalSize = 0;
+    CFIndex index;
+    for (index = 0; index < count; index++)
+        totalSize += CFDataGetLength(static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, index)));
+
+    RetainPtr<CFMutableDataRef> mergedData(AdoptCF, CFDataCreateMutable(kCFAllocatorDefault, totalSize));
+    for (index = 0; index < count; index++) {
+        CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, index));
+        CFDataAppendBytes(mergedData.get(), CFDataGetBytePtr(data), CFDataGetLength(data));
+    }
+
+    client()->didReceiveData(this, reinterpret_cast<const char*>(CFDataGetBytePtr(mergedData.get())), totalSize, static_cast<int>(totalSize));
+}
+#endif
+
 } // namespace WebCore
 
-#endif // USE(CFNETWORK)

trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -809 +809 @@
         return;
 
-    if (m_handle->client()->supportsDataArray())
-        m_handle->client()->didReceiveDataArray(m_handle, reinterpret_cast<CFArrayRef>(dataArray));
-    else {
-        NSUInteger count = [dataArray count];
-        ASSERT(count);
-        if (count == 1) {
-            NSData *data = [dataArray objectAtIndex:0];
-            m_handle->client()->didReceiveData(m_handle, static_cast<const char*>([data bytes]), [data length], static_cast<int>([data length]));
-        } else {
-            NSUInteger totalSize = 0;
-            for (NSData *data in dataArray)
-                totalSize += [data length];
-
-            RetainPtr<NSMutableData> mergedData(AdoptNS, [[NSMutableData alloc] initWithCapacity:totalSize]);
-            for (NSData *data in dataArray)
-                [mergedData.get() appendData:data];
-
-            m_handle->client()->didReceiveData(m_handle, static_cast<const char*>([mergedData.get() bytes]), totalSize, static_cast<int>(totalSize));
-        }
-    }
-
+    m_handle->handleDataArray(reinterpret_cast<CFArrayRef>(dataArray));
     // The call to didReceiveData above can cancel a load, and if so, the delegate (self) could have been deallocated by this point.
 }