Changeset 161177 in webkit

Timestamp:

Dec 31, 2013 12:30:26 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Implement ResourceHandle::continueWillSendRequest()
​https://bugs.webkit.org/show_bug.cgi?id=126291

Reviewed by Martin Robinson.

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::continueAfterWillSendRequest): Helper function that
continues with the load after willSendRequest has been called.
(WebCore::doRedirect): Call continueAfterWillSendRequest() when
client doesn't use async callbacks.
(WebCore::ResourceHandle::continueWillSendRequest): Call
continueAfterWillSendRequest().

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Implement ResourceHandle::continueWillSendRequest()
+        https://bugs.webkit.org/show_bug.cgi?id=126291
+
+        Reviewed by Martin Robinson.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::continueAfterWillSendRequest): Helper function that
+        continues with the load after willSendRequest has been called.
+        (WebCore::doRedirect): Call continueAfterWillSendRequest() when
+        client doesn't use async callbacks.
+        (WebCore::ResourceHandle::continueWillSendRequest): Call
+        continueAfterWillSendRequest().
+
 2013-12-30  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -456 +456 @@
 }
 
+static void continueAfterWillSendRequest(ResourceHandle* handle, const ResourceRequest& newRequest)
+{
+    // willSendRequest might cancel the load.
+    if (handle->cancelledOrClientless())
+        return;
+
+    if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
+        handle->getInternal()->client()->cannotShowURL(handle);
+        return;
+    }
+
+    handle->sendPendingRequest();
+}
+
 static void doRedirect(ResourceHandle* handle)
 {
@@ -507 +521 @@
     newRequest.removeCredentials();
 
+    cleanupSoupRequestOperation(handle);
+
     if (d->client()->usesAsyncCallbacks())
         d->client()->willSendRequestAsync(handle, newRequest, d->m_response);
-    else
+    else {
         d->client()->willSendRequest(handle, newRequest, d->m_response);
-
-    cleanupSoupRequestOperation(handle);
-
-    // willSendRequest might cancel the load.
-    if (handle->cancelledOrClientless())
-        return;
-
-    if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
-        d->client()->cannotShowURL(handle);
-        return;
-    }
-
-    handle->sendPendingRequest();
+        continueAfterWillSendRequest(handle, newRequest);
+    }
+
 }
 
@@ -1393 +1399 @@
     ASSERT(client());
     ASSERT(client()->usesAsyncCallbacks());
-    // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
+    continueAfterWillSendRequest(this, request);
 }