Changeset 143329 in webkit

Timestamp:

Feb 19, 2013 7:16:07 AM (11 years ago)

Author:

sergio@webkit.org

Message:

[Soup] Use synchronous calls to close completely processed streams
​https://bugs.webkit.org/show_bug.cgi?id=107432

Reviewed by Martin Robinson.

There is no need to close already processed streams in asynchronous
calls since they won't block. Using the synchronous call will save
us some code and unnecessary asynchronous burden. This is kind of
a code refactor so no new tests needed.

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore):
(WebCore::redirectSkipCallback):
(WebCore::readCallback):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Sergio Villar Senin  <svillar@igalia.com>
+
+        [Soup] Use synchronous calls to close completely processed streams
+        https://bugs.webkit.org/show_bug.cgi?id=107432
+
+        Reviewed by Martin Robinson.
+
+        There is no need to close already processed streams in asynchronous
+        calls since they won't block. Using the synchronous call will save
+        us some code and unnecessary asynchronous burden. This is kind of
+        a code refactor so no new tests needed.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore):
+        (WebCore::redirectSkipCallback):
+        (WebCore::readCallback):
+
 2013-02-19  Andrey Adaikin  <aandrey@chromium.org>
 

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

@@ -232 +232 @@
 static void sendRequestCallback(GObject*, GAsyncResult*, gpointer);
 static void readCallback(GObject*, GAsyncResult*, gpointer);
-static void closeCallback(GObject*, GAsyncResult*, gpointer);
 static gboolean requestTimeoutCallback(void*);
 #if ENABLE(WEB_TIMING)
@@ -500 +499 @@
 }
 
-static void redirectCloseCallback(GObject*, GAsyncResult* result, gpointer data)
-{
-    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
-
-    if (handle->cancelledOrClientless()) {
-        cleanupSoupRequestOperation(handle.get());
-        return;
-    }
-
-    ResourceHandleInternal* d = handle->getInternal();
-    g_input_stream_close_finish(d->m_inputStream.get(), result, 0);
-    doRedirect(handle.get());
-}
-
 static void redirectSkipCallback(GObject*, GAsyncResult* asyncResult, gpointer data)
 {
@@ -539 +524 @@
     }
 
-    g_input_stream_close_async(d->m_inputStream.get(), G_PRIORITY_DEFAULT, 0, redirectCloseCallback, handle.get());
+    g_input_stream_close(d->m_inputStream.get(), 0, 0);
+    doRedirect(handle.get());
 }
 
@@ -1306 +1292 @@
 }
 
-static void closeCallback(GObject*, GAsyncResult* res, gpointer data)
-{
-    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
-    ResourceHandleInternal* d = handle->getInternal();
-
-    g_input_stream_close_finish(d->m_inputStream.get(), res, 0);
-
-    if (handle->client() && loadingSynchronousRequest)
-        handle->client()->didFinishLoading(handle.get(), 0);
-
-    cleanupSoupRequestOperation(handle.get());
-}
-
 static void readCallback(GObject*, GAsyncResult* asyncResult, gpointer data)
 {
@@ -1352 +1325 @@
         }
 
-        // We inform WebCore of load completion now instead of waiting for the input
-        // stream to close because the input stream is closed asynchronously. If this
-        // is a synchronous request, we wait until the closeCallback, because we don't
-        // want to halt the internal main loop before the input stream closes.
-        if (handle->client() && !loadingSynchronousRequest) {
-            handle->client()->didFinishLoading(handle.get(), 0);
-            handle->setClient(0); // Unset the client so that we do not try to access th
-                                  // client in the closeCallback.
-        }
-        g_input_stream_close_async(d->m_inputStream.get(), G_PRIORITY_DEFAULT, 0, closeCallback, handle.get());
+        g_input_stream_close(d->m_inputStream.get(), 0, 0);
+
+        handle->client()->didFinishLoading(handle.get(), 0);
+        cleanupSoupRequestOperation(handle.get());
         return;
     }