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

Timestamp:

Mar 22, 2012, 10:01:48 AM (13 years ago)

Author:

[email protected]

Message:

Event dispatching in XMLHttpRequestProgressEventThrottle should go through XMLHttpRequestProgressEventThrottle::dispatchEvent
​https://bugs.webkit.org/show_bug.cgi?id=46743

Patch by Allan Sandfeld Jensen <​[email protected]> on 2012-03-22
Reviewed by Julien Chaffraix
Based on original patch by Anton D'Auria

In preparation for platform-specific queuing of XMLHttpRequest events,
this patch changes all calls to m_target->dispatchEvent to
XMLHttpRequestProgressEventThrottle::dispatchEvent.
Currently, we queue only one progress event on suspend() if we have
throttled progress events. We should be able to queue all XHR events
that can be generated after suspend(), if the platform network layer
continues to receive data.
XMLHttpRequest uses XMLHttpRequestProgressEventThrottle to dispatch only
download events, so this doesn't change behavior of upload events, which
aren't throttled or queued.

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::callReadyStateChangeListener):

• xml/XMLHttpRequestProgressEventThrottle.cpp:

(WebCore::XMLHttpRequestProgressEventThrottle::dispatchReadyStateChangeEvent):
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchEvent):
(WebCore::XMLHttpRequestProgressEventThrottle::flushProgressEvent):
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchPausedEvent):
(WebCore::XMLHttpRequestProgressEventThrottle::fired):

• xml/XMLHttpRequestProgressEventThrottle.h:

(XMLHttpRequestProgressEventThrottle):

File:

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

trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp

@@ -70 +70 @@
 }
 
-void XMLHttpRequestProgressEventThrottle::dispatchEvent(PassRefPtr<Event> event, ProgressEventAction progressEventAction)
+void XMLHttpRequestProgressEventThrottle::dispatchReadyStateChangeEvent(PassRefPtr<Event> event, ProgressEventAction progressEventAction)
+{
+    if (progressEventAction == FlushProgressEvent)
+        flushProgressEvent();
+
+    dispatchEvent(event);
+}
+
+void XMLHttpRequestProgressEventThrottle::dispatchEvent(PassRefPtr<Event> event)
 {
     ASSERT(!suspended());
     // We should not have any pending events from a previous resume.
     ASSERT(!m_pausedEvent);
-
-    if (progressEventAction == FlushProgressEvent)
-        flushProgressEvent();
 
     m_target->dispatchEvent(event);
@@ -102 +107 @@
     stop();
 
-    m_target->dispatchEvent(event);
+    dispatchEvent(event);
 }
 
@@ -111 +116 @@
         return;
 
-    m_target->dispatchEvent(m_pausedEvent);
+    dispatchEvent(m_pausedEvent);
     m_pausedEvent = 0;
 }
@@ -126 +131 @@
     }
 
-    m_target->dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, m_lengthComputable, m_loaded, m_total));
+    dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, m_lengthComputable, m_loaded, m_total));
     m_total = 0;
     m_loaded = 0;