projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
xml
/
XMLHttpRequestProgressEventThrottle.cpp
diff --git
a/src/third_party/WebKit/Source/core/xml/XMLHttpRequestProgressEventThrottle.cpp
b/src/third_party/WebKit/Source/core/xml/XMLHttpRequestProgressEventThrottle.cpp
index
d651dc5
..
ac12df8
100644
(file)
--- a/
src/third_party/WebKit/Source/core/xml/XMLHttpRequestProgressEventThrottle.cpp
+++ b/
src/third_party/WebKit/Source/core/xml/XMLHttpRequestProgressEventThrottle.cpp
@@
-75,7
+75,7
@@
void XMLHttpRequestProgressEventThrottle::dispatchProgressEvent(bool lengthCompu
m_total = total;
}
m_total = total;
}
-void XMLHttpRequestProgressEventThrottle::dispatchReadyStateChangeEvent(PassRefPtr<Event> event, ProgressEventAction progressEventAction)
+void XMLHttpRequestProgressEventThrottle::dispatchReadyStateChangeEvent(PassRefPtr
WillBeRawPtr
<Event> event, ProgressEventAction progressEventAction)
{
if (progressEventAction == FlushProgressEvent || progressEventAction == FlushDeferredProgressEvent) {
if (!flushDeferredProgressEvent() && progressEventAction == FlushProgressEvent)
{
if (progressEventAction == FlushProgressEvent || progressEventAction == FlushDeferredProgressEvent) {
if (!flushDeferredProgressEvent() && progressEventAction == FlushProgressEvent)
@@
-85,7
+85,7
@@
void XMLHttpRequestProgressEventThrottle::dispatchReadyStateChangeEvent(PassRefP
dispatchEvent(event);
}
dispatchEvent(event);
}
-void XMLHttpRequestProgressEventThrottle::dispatchEvent(PassRefPtr<Event> event)
+void XMLHttpRequestProgressEventThrottle::dispatchEvent(PassRefPtr
WillBeRawPtr
<Event> event)
{
ASSERT(event);
if (m_deferEvents) {
{
ASSERT(event);
if (m_deferEvents) {
@@
-122,7
+122,7
@@
void XMLHttpRequestProgressEventThrottle::deliverProgressEvent()
if (!hasEventToDispatch())
return;
if (!hasEventToDispatch())
return;
-
PassRef
Ptr<Event> event = XMLHttpRequestProgressEvent::create(EventTypeNames::progress, m_lengthComputable, m_loaded, m_total);
+
RefPtrWillBeRaw
Ptr<Event> event = XMLHttpRequestProgressEvent::create(EventTypeNames::progress, m_lengthComputable, m_loaded, m_total);
m_loaded = 0;
m_total = 0;
m_loaded = 0;
m_total = 0;
@@
-139,14
+139,14
@@
void XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents(Timer<XMLHttpRe
m_deferEvents = false;
// Take over the deferred events before dispatching them which can potentially add more.
m_deferEvents = false;
// Take over the deferred events before dispatching them which can potentially add more.
-
Vector<RefPt
r<Event> > deferredEvents;
+
WillBeHeapVector<RefPtrWillBeMembe
r<Event> > deferredEvents;
m_deferredEvents.swap(deferredEvents);
m_deferredEvents.swap(deferredEvents);
- RefPtr<Event> deferredProgressEvent = m_deferredProgressEvent;
+ RefPtr
WillBeRawPtr
<Event> deferredProgressEvent = m_deferredProgressEvent;
m_deferredProgressEvent = nullptr;
m_deferredProgressEvent = nullptr;
-
Vector<RefPt
r<Event> >::const_iterator it = deferredEvents.begin();
- const
Vector<RefPt
r<Event> >::const_iterator end = deferredEvents.end();
+
WillBeHeapVector<RefPtrWillBeMembe
r<Event> >::const_iterator it = deferredEvents.begin();
+ const
WillBeHeapVector<RefPtrWillBeMembe
r<Event> >::const_iterator end = deferredEvents.end();
for (; it != end; ++it)
dispatchEvent(*it);
for (; it != end; ++it)
dispatchEvent(*it);
@@
-216,4
+216,10
@@
void XMLHttpRequestProgressEventThrottle::resume()
m_dispatchDeferredEventsTimer.startOneShot(0, FROM_HERE);
}
m_dispatchDeferredEventsTimer.startOneShot(0, FROM_HERE);
}
+void XMLHttpRequestProgressEventThrottle::trace(Visitor* visitor)
+{
+ visitor->trace(m_deferredProgressEvent);
+ visitor->trace(m_deferredEvents);
+}
+
} // namespace WebCore
} // namespace WebCore