Changeset 160961 in webkit

Timestamp:

Dec 21, 2013 12:51:07 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] ResourceHandleSoup should use async client callbacks when client uses async callbacks
​https://bugs.webkit.org/show_bug.cgi?id=126006

Reviewed by Martin Robinson.

This fixes WebKit2 loader client unit tests when using the network
process.

• platform/network/ResourceHandle.cpp:
• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::doRedirect): Call willSendRequestAsync on the client
when usesAsyncCallbacks returns true.
(WebCore::nextMultipartResponsePartCallback): Call
didReceiveResponseAsync on the client when usesAsyncCallbacks
returns true.
(WebCore::sendRequestCallback): Ditto.
(WebCore::ResourceHandle::continueWillSendRequest): Empty
implementation for now because the default one asserts.
(WebCore::ResourceHandle::continueDidReceiveResponse): Ditto.
(WebCore::ResourceHandle::continueShouldUseCredentialStorage): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandle.cpp (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] ResourceHandleSoup should use async client callbacks when client uses async callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=126006
+
+        Reviewed by Martin Robinson.
+
+        This fixes WebKit2 loader client unit tests when using the network
+        process.
+
+        * platform/network/ResourceHandle.cpp:
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::doRedirect): Call willSendRequestAsync on the client
+        when usesAsyncCallbacks returns true.
+        (WebCore::nextMultipartResponsePartCallback): Call
+        didReceiveResponseAsync on the client when usesAsyncCallbacks
+        returns true.
+        (WebCore::sendRequestCallback): Ditto.
+        (WebCore::ResourceHandle::continueWillSendRequest): Empty
+        implementation for now because the default one asserts.
+        (WebCore::ResourceHandle::continueDidReceiveResponse): Ditto.
+        (WebCore::ResourceHandle::continueShouldUseCredentialStorage): Ditto.
+
 2013-12-20  Anders Carlsson  <andersca@apple.com>
 

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

@@ -148 +148 @@
 }
 
-#if !PLATFORM(MAC) && !USE(CFNETWORK)
+#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP)
 // ResourceHandle never uses async client calls on these platforms yet.
 void ResourceHandle::continueWillSendRequest(const ResourceRequest&)

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -512 +512 @@
     newRequest.removeCredentials();
 
-    d->client()->willSendRequest(handle, newRequest, d->m_response);
+    if (d->client()->usesAsyncCallbacks())
+        d->client()->willSendRequestAsync(handle, newRequest, d->m_response);
+    else
+        d->client()->willSendRequest(handle, newRequest, d->m_response);
     handle->sendPendingRequest();
 }
@@ -650 +653 @@
     d->m_response.updateFromSoupMessageHeaders(soup_multipart_input_stream_get_headers(d->m_multipartInputStream.get()));
 
-    handle->client()->didReceiveResponse(handle.get(), d->m_response);
+    if (handle->client()->usesAsyncCallbacks())
+        handle->client()->didReceiveResponseAsync(handle.get(), d->m_response);
+    else
+        handle->client()->didReceiveResponse(handle.get(), d->m_response);
 
     if (handle->cancelledOrClientless()) {
@@ -717 +723 @@
     }
 
-    handle->client()->didReceiveResponse(handle.get(), d->m_response);
+    if (d->client()->usesAsyncCallbacks())
+        handle->client()->didReceiveResponseAsync(handle.get(), d->m_response);
+    else
+        handle->client()->didReceiveResponse(handle.get(), d->m_response);
 
     if (handle->cancelledOrClientless()) {
@@ -1371 +1380 @@
 }
 
+void ResourceHandle::continueWillSendRequest(const ResourceRequest& request)
+{
+    ASSERT(client());
+    ASSERT(client()->usesAsyncCallbacks());
+    // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
+}
+
+void ResourceHandle::continueDidReceiveResponse()
+{
+    ASSERT(client());
+    ASSERT(client()->usesAsyncCallbacks());
+    // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
+}
+
+void ResourceHandle::continueShouldUseCredentialStorage(bool)
+{
+    ASSERT(client());
+    ASSERT(client()->usesAsyncCallbacks());
+    // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
+}
+
 static gboolean requestTimeoutCallback(gpointer data)
 {