Changeset 169055 in webkit

Timestamp:

May 19, 2014, 12:54:48 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r168909.

Location:

branches/safari-538.34.5-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/BlobResourceHandle.cpp (modified) (1 diff)
• platform/network/BlobResourceHandle.h (modified) (2 diffs)
• platform/network/ResourceHandle.h (modified) (1 diff)

branches/safari-538.34.5-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-19  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r168909
+
+    2014-05-15  Alexey Proskuryakov  <ap@apple.com>
+
+            NetworkProcess crashes at ResourceHandle::continueDidReceiveResponse
+            https://bugs.webkit.org/show_bug.cgi?id=132966
+            <rdar://problem/16373694>
+
+            Reviewed by Brady Eidson.
+
+            Covered by many fast/files tests.
+
+            * platform/network/BlobResourceHandle.cpp: (WebCore::BlobResourceHandle::continueDidReceiveResponse):
+            * platform/network/BlobResourceHandle.h:
+            * platform/network/ResourceHandle.h:
+            Don't call delegate's continueDidReceiveResponse when loading a blob:// URL,
+            the delegate is null. On the Mac, we used to lazily create it, which was also wrong,
+            but at least not observable.
+
 2014-05-16  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp

@@ -203 +203 @@
 }
 
+void BlobResourceHandle::continueDidReceiveResponse()
+{
+    // BlobResourceHandle doesn't wait for didReceiveResponse, and it currently cannot be used for downloading.
+}
+
 void delayedStartBlobResourceHandle(void* context)
 {

branches/safari-538.34.5-branch/Source/WebCore/platform/network/BlobResourceHandle.h

@@ -49 +49 @@
 struct BlobDataItem;
 
-class BlobResourceHandle : public FileStreamClient, public ResourceHandle  {
+class BlobResourceHandle final : public FileStreamClient, public ResourceHandle  {
 public:
     static PassRefPtr<BlobResourceHandle> createAsync(BlobData*, const ResourceRequest&, ResourceHandleClient*);
 
     static void loadResourceSynchronously(BlobData*, const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data);
-
-    // FileStreamClient methods.
-    virtual void didGetSize(long long) override;
-    virtual void didOpen(bool) override;
-    virtual void didRead(int) override;
-
-    // ResourceHandle methods.
-    virtual void cancel() override;
 
     void start();
@@ -73 +65 @@
     BlobResourceHandle(BlobData*, const ResourceRequest&, ResourceHandleClient*, bool async);
     virtual ~BlobResourceHandle();
+
+    // FileStreamClient methods.
+    virtual void didGetSize(long long) override;
+    virtual void didOpen(bool) override;
+    virtual void didRead(int) override;
+
+    // ResourceHandle methods.
+    virtual void cancel() override;
+    virtual void continueDidReceiveResponse() override;
 
     void doStart();

branches/safari-538.34.5-branch/Source/WebCore/platform/network/ResourceHandle.h

@@ -208 +208 @@
 
     // Called in response to ResourceHandleClient::didReceiveResponseAsync().
-    void continueDidReceiveResponse();
+    virtual void continueDidReceiveResponse();
 
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)