Changeset 90400 in webkit

Timestamp:

Jul 5, 2011 10:34:43 AM (13 years ago)

Author:

psolanki@apple.com

Message:

2011-07-05 Pratik Solanki <​psolanki@apple.com>

Reviewed by Dan Bernstein.

Coalesce data array into one NSData before calling didReceiveData
​https://bugs.webkit.org/show_bug.cgi?id=63916
<rdar://problem/9715181>

Instead of calling didReceiveData multiple times with smaller chunks of data, we merge the
data buffers into one and call it once.

No new tests because the flag isn't enabled yet.

• platform/network/mac/ResourceHandleMac.mm: (-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-05  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Coalesce data array into one NSData before calling didReceiveData
+        https://bugs.webkit.org/show_bug.cgi?id=63916
+        <rdar://problem/9715181>
+
+        Instead of calling didReceiveData multiple times with smaller chunks of data, we merge the
+        data buffers into one and call it once.
+
+        No new tests because the flag isn't enabled yet.
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (-[WebCoreResourceHandleAsDelegate connection:didReceiveDataArray:]):
+
 2011-07-05  Tamas Czene  <Czene.Tamas@stud.u-szeged.hu>
 

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

@@ -812 +812 @@
         m_handle->client()->didReceiveDataArray(m_handle, reinterpret_cast<CFArrayRef>(dataArray));
     else {
-        // The call to didReceiveData below could cancel a load, which would result in the delegate
-        // (self) being released.
-        RetainPtr<WebCoreResourceHandleAsDelegate> protect(self);
-        for (NSData *data in dataArray) {
-            if (!m_handle)
-                break;
+        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));
         }
     }
-    return;
+
+    // The call to didReceiveData above can cancel a load, and if so, the delegate (self) could have been deallocated by this point.
 }
 #endif