Changeset 278595 in webkit

Timestamp:

Jun 8, 2021, 12:57:00 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r278391): [SOUP] Test fast/dom/webtiming.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=226726

Reviewed by Michael Catanzaro.

We need to set network metrics on response even for non HTTP loads now.

Fixes fast/dom/webtiming.html

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::NetworkDataTaskSoup::resume):
(WebKit::NetworkDataTaskSoup::didSendRequest):
(WebKit::NetworkDataTaskSoup::dispatchDidReceiveResponse):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r278391): [SOUP] Test fast/dom/webtiming.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=226726
+
+        Reviewed by Michael Catanzaro.
+
+        We need to set network metrics on response even for non HTTP loads now.
+
+        Fixes fast/dom/webtiming.html
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::resume):
+        (WebKit::NetworkDataTaskSoup::didSendRequest):
+        (WebKit::NetworkDataTaskSoup::dispatchDidReceiveResponse):
+
 2021-06-07  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -328 +328 @@
 
     if (m_file && !m_cancellable) {
+        m_networkLoadMetrics.fetchStart = MonotonicTime::now();
         m_cancellable = adoptGRef(g_cancellable_new());
         g_file_query_info_async(m_file.get(), G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE,
@@ -335 +336 @@
 
     if (m_currentRequest.url().protocolIsData() && !m_cancellable) {
+        m_networkLoadMetrics.fetchStart = MonotonicTime::now();
         m_cancellable = adoptGRef(g_cancellable_new());
         DataURLDecoder::decode(m_currentRequest.url(), { }, DataURLDecoder::Mode::Legacy, [this, protectedThis = WTFMove(protectedThis)](auto decodeResult) mutable {
@@ -482 +484 @@
 #endif
 
+    dispatchDidReceiveResponse();
+}
+
+void NetworkDataTaskSoup::dispatchDidReceiveResponse()
+{
+    ASSERT(!m_response.isNull());
+
     // FIXME: This cannot be eliminated until other code no longer relies on ResourceResponse's NetworkLoadMetrics.
     m_response.setDeprecatedNetworkLoadMetrics(Box<NetworkLoadMetrics>::create(m_networkLoadMetrics));
-    dispatchDidReceiveResponse();
-}
-
-void NetworkDataTaskSoup::dispatchDidReceiveResponse()
-{
-    ASSERT(!m_response.isNull());
 
     didReceiveResponse(ResourceResponse(m_response), NegotiatedLegacyTLS::No, [this, protectedThis = makeRef(*this)](PolicyAction policyAction) {