Changeset 148068 in webkit

Timestamp:

Apr 9, 2013, 5:04:55 PM (12 years ago)

Author:

ap@apple.com

Message:

REGRESSION: Blob URLs broken with NetworkProcess
​https://bugs.webkit.org/show_bug.cgi?id=114320

Reviewed by Brady Eidson.

Update BlobResourceHandle to use modern resource client calls.

• platform/network/BlobResourceHandle.cpp: (WebCore::BlobResourceHandle::readSync): Don't call notifyReceiveData if there is no data (it's especially egregious when length is -1, signaling an error). (WebCore::BlobResourceHandle::notifyResponseOnSuccess): Use didReceiveResponseAsync when a client wants async callbacks. This is not very clean, as we don't wait for response, but should be workable for blobs. (WebCore::BlobResourceHandle::notifyResponseOnError): Ditto. (WebCore::BlobResourceHandle::notifyReceiveData): Use didReceiveBuffer (clients that only implement didReceiveData will have it automatically unwrapped).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/BlobResourceHandle.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-09  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION: Blob URLs broken with NetworkProcess
+        https://bugs.webkit.org/show_bug.cgi?id=114320
+
+        Reviewed by Brady Eidson.
+
+        Update BlobResourceHandle to use modern resource client calls.
+
+        * platform/network/BlobResourceHandle.cpp:
+        (WebCore::BlobResourceHandle::readSync): Don't call notifyReceiveData if there is
+        no data (it's especially egregious when length is -1, signaling an error).
+        (WebCore::BlobResourceHandle::notifyResponseOnSuccess): Use didReceiveResponseAsync
+        when a client wants async callbacks. This is not very clean, as we don't wait
+        for response, but should be workable for blobs.
+        (WebCore::BlobResourceHandle::notifyResponseOnError): Ditto.
+        (WebCore::BlobResourceHandle::notifyReceiveData): Use didReceiveBuffer (clients
+        that only implement didReceiveData will have it automatically unwrapped).
+
 2013-04-09  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp

@@ -45 +45 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
+#include "SharedBuffer.h"
 #include <wtf/MainThread.h>
 
@@ -379 +380 @@
         result = length - remaining;
 
-    notifyReceiveData(buf, result);
+    if (result > 0)
+        notifyReceiveData(buf, result);
+
     if (!result)
         notifyFinish();
@@ -581 +584 @@
     if (!m_blobData->contentDisposition().isEmpty())
         response.setHTTPHeaderField("Content-Disposition", m_blobData->contentDisposition());
-    client()->didReceiveResponse(this, response);
+
+    // BlobResourceHandle cannot be used with downloading, and doesn't even wait for continueDidReceiveResponse.
+    // It's currently client's responsibility to know that didReceiveResponseAsync cannot be used to convert a
+    // load into a download or blobs.
+    if (client()->usesAsyncCallbacks())
+        client()->didReceiveResponseAsync(this, response);
+    else
+        client()->didReceiveResponse(this, response);
 }
 
@@ -607 +617 @@
         break;
     }
-    client()->didReceiveResponse(this, response);
+
+    // Note that we don't wait for continueDidReceiveResponse when using didReceiveResponseAsync.
+    // This is not formally correct, but the client has to be a no-op anyway, because blobs can't be downloaded.
+    if (client()->usesAsyncCallbacks())
+        client()->didReceiveResponseAsync(this, response);
+    else
+        client()->didReceiveResponse(this, response);
 }
 
@@ -613 +629 @@
 {
     if (client())
-        client()->didReceiveData(this, data, bytesRead, bytesRead);
+        client()->didReceiveBuffer(this, SharedBuffer::create(data, bytesRead), bytesRead);
 }