Changeset 279967 in webkit for trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp

Timestamp:

Jul 15, 2021, 3:52:51 PM (4 years ago)

Author:

Chris Dumez

Message:

Sync XHR 'load' event is always has total/loaded=0
​https://bugs.webkit.org/show_bug.cgi?id=228004

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

Rebaseline WPT test that is now passing.

• web-platform-tests/xhr/send-sync-response-event-order-expected.txt:

Source/WebCore:

XMLHttpRequest::didReceiveData() was not calling XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent()
for sync XHRs because we don't want to fire 'progress' events for sync XHR. However, dispatchThrottledProgressEvent()
also updates XMLHttpRequestProgressEventThrottle's m_loaded / m_total members and we do want those to get updated for
sync XHRs, since they get used later on for the 'load' event.

No new tests, rebaselined existing test.

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::didReceiveData):

• xml/XMLHttpRequestProgressEventThrottle.cpp:

(WebCore::XMLHttpRequestProgressEventThrottle::updateProgress):
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent): Deleted.

• xml/XMLHttpRequestProgressEventThrottle.h:

File:

• trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (modified) (2 diffs)

trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp

@@ -46 +46 @@
 XMLHttpRequestProgressEventThrottle::~XMLHttpRequestProgressEventThrottle() = default;
 
-void XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total)
+void XMLHttpRequestProgressEventThrottle::updateProgress(bool isAsync, bool lengthComputable, unsigned long long loaded, unsigned long long total)
 {
     m_lengthComputable = lengthComputable;
@@ -52 +52 @@
     m_total = total;
 
-    if (!m_target.hasEventListeners(eventNames().progressEvent))
+    if (!isAsync || !m_target.hasEventListeners(eventNames().progressEvent))
         return;