<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174235] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174235">174235</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-02 15:49:06 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>XMLHttpRequestProgressEventThrottle shouldn't throttle / defer progress events if there are no listeners
https://bugs.webkit.org/show_bug.cgi?id=137346
Reviewed by Alexey Proskuryakov.
Previously XMLHttpRequestProgressEventThrottle would throttle / defer
progress events, which involves queueing events and starting timers,
even if there were no listeners for those events (which is fairly
common case).
This patch updates XMLHttpRequestProgressEventThrottle to make sure
there are actual progress event listeners *before* attempting to
throttle and do extra processing, to avoid doing unnecessary work.
This patch also makes XMLHttpRequestProgressEventThrottle::dispatchEvent()
private as this method is only called from other dispatch methods of
the class and never from the outside.
No new tests, no behavior change.
* xml/XMLHttpRequestProgressEventThrottle.cpp:
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent):
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchProgressEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp">trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottleh">trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174234 => 174235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-02 22:48:48 UTC (rev 174234)
+++ trunk/Source/WebCore/ChangeLog 2014-10-02 22:49:06 UTC (rev 174235)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-10-02 Chris Dumez <cdumez@apple.com>
+
+ XMLHttpRequestProgressEventThrottle shouldn't throttle / defer progress events if there are no listeners
+ https://bugs.webkit.org/show_bug.cgi?id=137346
+
+ Reviewed by Alexey Proskuryakov.
+
+ Previously XMLHttpRequestProgressEventThrottle would throttle / defer
+ progress events, which involves queueing events and starting timers,
+ even if there were no listeners for those events (which is fairly
+ common case).
+
+ This patch updates XMLHttpRequestProgressEventThrottle to make sure
+ there are actual progress event listeners *before* attempting to
+ throttle and do extra processing, to avoid doing unnecessary work.
+
+ This patch also makes XMLHttpRequestProgressEventThrottle::dispatchEvent()
+ private as this method is only called from other dispatch methods of
+ the class and never from the outside.
+
+ No new tests, no behavior change.
+
+ * xml/XMLHttpRequestProgressEventThrottle.cpp:
+ (WebCore::XMLHttpRequestProgressEventThrottle::dispatchThrottledProgressEvent):
+ (WebCore::XMLHttpRequestProgressEventThrottle::dispatchProgressEvent):
+
</ins><span class="cx"> 2014-10-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Subpixel] Use floats instead of ints for text justification expansion
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (174234 => 174235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2014-10-02 22:48:48 UTC (rev 174234)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2014-10-02 22:49:06 UTC (rev 174235)
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx"> m_lengthComputable = lengthComputable;
</span><span class="cx"> m_loaded = loaded;
</span><span class="cx"> m_total = total;
</span><ins>+
+ if (!m_target->hasEventListeners(eventNames().progressEvent))
+ return;
</ins><span class="cx">
</span><span class="cx"> if (m_deferEvents) {
</span><span class="cx"> // Only store the latest progress event while suspended.
</span><span class="lines">@@ -100,7 +103,7 @@
</span><span class="cx"> m_target->dispatchEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void XMLHttpRequestProgressEventThrottle::dispatchProgressEvent(const AtomicString &type)
</del><ins>+void XMLHttpRequestProgressEventThrottle::dispatchProgressEvent(const AtomicString& type)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(type == eventNames().loadstartEvent || type == eventNames().progressEvent || type == eventNames().loadEvent || type == eventNames().loadendEvent || type == eventNames().abortEvent || type == eventNames().errorEvent || type == eventNames().timeoutEvent);
</span><span class="cx">
</span><span class="lines">@@ -110,7 +113,8 @@
</span><span class="cx"> m_total = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dispatchEvent(XMLHttpRequestProgressEvent::create(type, m_lengthComputable, m_loaded, m_total));
</del><ins>+ if (m_target->hasEventListeners(type))
+ dispatchEvent(XMLHttpRequestProgressEvent::create(type, m_lengthComputable, m_loaded, m_total));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequestProgressEventThrottle::flushProgressEvent()
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h (174234 => 174235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h 2014-10-02 22:48:48 UTC (rev 174234)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h 2014-10-02 22:49:06 UTC (rev 174235)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> void dispatchThrottledProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total);
</span><span class="cx"> void dispatchReadyStateChangeEvent(PassRefPtr<Event>, ProgressEventAction = DoNotFlushProgressEvent);
</span><del>- void dispatchEvent(PassRefPtr<Event>);
</del><span class="cx"> void dispatchProgressEvent(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> void suspend();
</span><span class="lines">@@ -63,6 +62,7 @@
</span><span class="cx"> virtual void fired();
</span><span class="cx"> void dispatchDeferredEvents(Timer<XMLHttpRequestProgressEventThrottle>*);
</span><span class="cx"> void flushProgressEvent();
</span><ins>+ void dispatchEvent(PassRefPtr<Event>);
</ins><span class="cx">
</span><span class="cx"> bool hasEventToDispatch() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>