Title: [278595] trunk/Source/WebKit
- Revision
- 278595
- Author
- [email protected]
- Date
- 2021-06-08 00:57:00 -0700 (Tue, 08 Jun 2021)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (278594 => 278595)
--- trunk/Source/WebKit/ChangeLog 2021-06-08 07:47:43 UTC (rev 278594)
+++ trunk/Source/WebKit/ChangeLog 2021-06-08 07:57:00 UTC (rev 278595)
@@ -1,3 +1,19 @@
+2021-06-08 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
Adopt SecTrustGetCertificateAtIndex replacement where available
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (278594 => 278595)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2021-06-08 07:47:43 UTC (rev 278594)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2021-06-08 07:57:00 UTC (rev 278595)
@@ -327,6 +327,7 @@
}
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,
G_FILE_QUERY_INFO_NONE, RunLoopSourcePriority::AsyncIONetwork, m_cancellable.get(), reinterpret_cast<GAsyncReadyCallback>(fileQueryInfoCallback), protectedThis.leakRef());
@@ -334,6 +335,7 @@
}
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 {
if (m_state == State::Canceling || m_state == State::Completed || !m_client) {
@@ -481,8 +483,6 @@
m_networkLoadMetrics.responseStart = MonotonicTime::now();
#endif
- // FIXME: This cannot be eliminated until other code no longer relies on ResourceResponse's NetworkLoadMetrics.
- m_response.setDeprecatedNetworkLoadMetrics(Box<NetworkLoadMetrics>::create(m_networkLoadMetrics));
dispatchDidReceiveResponse();
}
@@ -490,6 +490,9 @@
{
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));
+
didReceiveResponse(ResourceResponse(m_response), NegotiatedLegacyTLS::No, [this, protectedThis = makeRef(*this)](PolicyAction policyAction) {
if (m_state == State::Canceling || m_state == State::Completed) {
clearRequest();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
