Changeset 278596 in webkit

Timestamp:

Jun 8, 2021, 1:00:16 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Several timing tests failing since r278477
​https://bugs.webkit.org/show_bug.cgi?id=226728

Reviewed by Michael Catanzaro.

responseBodyBytesReceived and responseBodyDecodedSize are expected to be always filled, and not only when
shouldCaptureExtraNetworkLoadMetrics() returns true.

Fixes: imported/w3c/web-platform-tests/navigation-timing/test_document_onload.html

imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values.html
imported/w3c/web-platform-tests/resource-timing/cors-preflight.any.worker.html

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::NetworkDataTaskSoup::createRequest):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Several timing tests failing since r278477
+        https://bugs.webkit.org/show_bug.cgi?id=226728
+
+        Reviewed by Michael Catanzaro.
+
+        responseBodyBytesReceived and responseBodyDecodedSize are expected to be always filled, and not only when
+        shouldCaptureExtraNetworkLoadMetrics() returns true.
+
+        Fixes: imported/w3c/web-platform-tests/navigation-timing/test_document_onload.html
+               imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values.html
+               imported/w3c/web-platform-tests/resource-timing/cors-preflight.any.worker.html
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::createRequest):
+
 2021-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -232 +232 @@
     g_signal_connect(m_soupMessage.get(), "authenticate", G_CALLBACK(authenticateCallback), this);
     g_signal_connect(m_soupMessage.get(), "accept-certificate", G_CALLBACK(acceptCertificateCallback), this);
+    g_signal_connect(m_soupMessage.get(), "got-body", G_CALLBACK(gotBodyCallback), this);
     if (shouldCaptureExtraNetworkLoadMetrics()) {
         g_signal_connect(m_soupMessage.get(), "wrote-headers", G_CALLBACK(wroteHeadersCallback), this);
         g_signal_connect(m_soupMessage.get(), "wrote-body", G_CALLBACK(wroteBodyCallback), this);
-        g_signal_connect(m_soupMessage.get(), "got-body", G_CALLBACK(gotBodyCallback), this);
     }
 #endif
@@ -1178 +1178 @@
 void NetworkDataTaskSoup::gotBodyCallback(SoupMessage* soupMessage, NetworkDataTaskSoup* task)
 {
-    if (task->state() == State::Canceling || task->state() == State::Completed || !task->m_client) {
+    if (task->state() == State::Canceling || task->state() == State::Completed || (!task->m_client && !task->isDownload())) {
         task->clearRequest();
         return;