ChangeLog

2012-03-21  Allan Sandfeld Jensen  <allan.jensen@nokia.com>

        Event dispatching in XMLHttpRequestProgressEventThrottle should go through XMLHttpRequestProgressEventThrottle::dispatchEvent

        https://bugs.webkit.org/show_bug.cgi?id=46743

        Reviewed by NOBODY (OOPS!).

        Based on original patch by Anton D'Auria

        * 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):

2012-03-21  Alexey Proskuryakov  <ap@apple.com>

        Remove obsolete File attributes

Source/WebCore/xml/XMLHttpRequest.cpp

@@void XMLHttpRequest::callReadyStateChangeListener()

    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willChangeXHRReadyState(scriptExecutionContext(), this);

    if (m_async || (m_state <= OPENED || m_state == DONE))

392 m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().readystatechangeEvent), m_state == DONE ? FlushProgressEvent : DoNotFlushProgressEvent);

392 m_progressEventThrottle.dispatchReadyStateChangeEvent(XMLHttpRequestProgressEvent::create(eventNames().readystatechangeEvent), m_state == DONE ? FlushProgressEvent : DoNotFlushProgressEvent);

    InspectorInstrumentation::didChangeXHRReadyState(cookie);

Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp

@@void XMLHttpRequestProgressEventThrottle::dispatchProgressEvent(bool lengthCompu

    m_total = total;

}

72 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);

}

@@void XMLHttpRequestProgressEventThrottle::flushProgressEvent()

    // We stop the timer as this is called when no more events are supposed to occur.

    stop();

104 ~~m_target->~~dispatchEvent(event);

109 dispatchEvent(event);

}

void XMLHttpRequestProgressEventThrottle::dispatchPausedEvent()

@@void XMLHttpRequestProgressEventThrottle::dispatchPausedEvent()

    if (!m_pausedEvent)

        return;

113 ~~m_target->~~dispatchEvent(m_pausedEvent);

118 dispatchEvent(m_pausedEvent);

    m_pausedEvent = 0;

}

@@void XMLHttpRequestProgressEventThrottle::fired()

        return;

    }

128 ~~m_target->~~dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, m_lengthComputable, m_loaded, m_total));

133 dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().progressEvent, m_lengthComputable, m_loaded, m_total));

    m_total = 0;

    m_loaded = 0;

}

Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h

@@public:

    virtual ~XMLHttpRequestProgressEventThrottle();

    void dispatchProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total);

52 void dispatchEvent(PassRefPtr<Event>, ProgressEventAction = DoNotFlushProgressEvent);

52 void dispatchReadyStateChangeEvent(PassRefPtr<Event>, ProgressEventAction = DoNotFlushProgressEvent);

53 void dispatchEvent(PassRefPtr<Event>);

    void dispatchEventAndLoadEnd(PassRefPtr<Event>);

    void suspend();