<!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>[175111] branches/safari-600.3-branch/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/175111">175111</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 02:29:10 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173208">r173208</a>. rdar://problem/18428706</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoredomScriptExecutionContextcpp">branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageDOMTimercpp">branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepageDOMTimerh">branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175110 => 175111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-23 09:28:01 UTC (rev 175110)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-23 09:29:10 UTC (rev 175111)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2014-10-23 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173208.
+
+ 2014-08-29 Gavin Barraclough <barraclough@apple.com>
+
+ Simplify DOMTimer::adjustMinimumTimerInterval -> updateTimerIntervalIfNecessary
+ https://bugs.webkit.org/show_bug.cgi?id=136402
+
+ Reviewed by Andreas Kling.
+
+ When the minimum DOM timer interval changes, the Page updates all DOMTimers accordingly.
+ Updating the fire/repeat interval on TimerBase requires a delta, but in
+ DOMTimer::adjustMinimumTimerInterval we have the new requested interval. In the case of
+ timers we can get the current interval to calculate the delta by calling repeatInterval(),
+ but in the case of one-shot timers neither TimerBase nor DOMTimer have store the interval
+ that was actually set for the timer (DOMTimer knows the original, unadjusted timer, but
+ not the actual interval). The way this currently works is that when the minimum interval
+ changes, Page calls adjustMinimumTimerInterval providing the previous minimum. If the
+ timer is one-shot, then adjustMinimumTimerInterval will use this to compute the delta
+ based on what the interval would have been.
+
+ We can simplify & unify with the code to throttle interval timers when the nesting
+ threshold is hit, by instead tracking the current timer interval as a member on DOMTimer &
+ using this to compute the delta in all cases.
+
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::adjustMinimumTimerInterval):
+ - adjustMinimumTimerInterval -> updateTimerIntervalIfNecessary
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::DOMTimer):
+ initialize m_currentTimerInterval
+ (WebCore::DOMTimer::fired):
+ - when the nesting level changes (potentially triggering throttling) just call updateTimerIntervalIfNecessary
+ (WebCore::DOMTimer::updateTimerIntervalIfNecessary):
+ - compute delta based on m_currentTimerInterval
+ (WebCore::DOMTimer::intervalClampedToMinimum):
+ - this now always takes m_originalInterval and scriptExecutionContext()->minimumTimerInterval()
+ as its inputs, so remove arguments.
+ (WebCore::DOMTimer::adjustMinimumTimerInterval): Deleted.
+ - adjustMinimumTimerInterval -> updateTimerIntervalIfNecessary
+ * page/DOMTimer.h:
+ - adjustMinimumTimerInterval -> updateTimerIntervalIfNecessary, added m_currentTimerInterval
+
+2014-10-23 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r173133.
</span><span class="cx">
</span><span class="cx"> 2014-08-29 Gavin Barraclough <barraclough@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp (175110 => 175111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-10-23 09:28:01 UTC (rev 175110)
+++ branches/safari-600.3-branch/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-10-23 09:29:10 UTC (rev 175111)
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (minimumTimerInterval() != oldMinimumTimerInterval) {
</span><span class="cx"> for (auto& timer : m_timeouts.values())
</span><del>- timer->adjustMinimumTimerInterval(oldMinimumTimerInterval);
</del><ins>+ timer->updateTimerIntervalIfNecessary();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.cpp (175110 => 175111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.cpp 2014-10-23 09:28:01 UTC (rev 175110)
+++ branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.cpp 2014-10-23 09:29:10 UTC (rev 175111)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> , m_nestingLevel(context->timerNestingLevel())
</span><span class="cx"> , m_action(WTF::move(action))
</span><span class="cx"> , m_originalInterval(interval)
</span><ins>+ , m_currentTimerInterval(intervalClampedToMinimum())
</ins><span class="cx"> , m_shouldForwardUserGesture(shouldForwardUserGesture(interval, m_nestingLevel))
</span><span class="cx"> {
</span><span class="cx"> RefPtr<DOMTimer> reference = adoptRef(this);
</span><span class="lines">@@ -70,11 +71,10 @@
</span><span class="cx"> m_timeoutId = context->circularSequentialID();
</span><span class="cx"> } while (!context->addTimeout(m_timeoutId, reference));
</span><span class="cx">
</span><del>- double intervalMilliseconds = intervalClampedToMinimum(interval, context->minimumTimerInterval());
</del><span class="cx"> if (singleShot)
</span><del>- startOneShot(intervalMilliseconds);
</del><ins>+ startOneShot(m_currentTimerInterval);
</ins><span class="cx"> else
</span><del>- startRepeating(intervalMilliseconds);
</del><ins>+ startRepeating(m_currentTimerInterval);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int DOMTimer::install(ScriptExecutionContext* context, std::unique_ptr<ScheduledAction> action, int timeout, bool singleShot)
</span><span class="lines">@@ -142,12 +142,7 @@
</span><span class="cx"> if (isActive()) {
</span><span class="cx"> if (m_nestingLevel < maxTimerNestingLevel) {
</span><span class="cx"> m_nestingLevel++;
</span><del>-
- double minimumInterval = context->minimumTimerInterval();
- if (repeatInterval() && repeatInterval() < minimumInterval) {
- if (m_nestingLevel == maxTimerNestingLevel)
- augmentRepeatInterval(minimumInterval - repeatInterval());
- }
</del><ins>+ updateTimerIntervalIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_action->execute(context);
</span><span class="lines">@@ -201,31 +196,34 @@
</span><span class="cx"> m_action = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTimer::adjustMinimumTimerInterval(double oldMinimumTimerInterval)
</del><ins>+void DOMTimer::updateTimerIntervalIfNecessary()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_nestingLevel <= maxTimerNestingLevel);
</span><span class="cx"> if (m_nestingLevel < maxTimerNestingLevel)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- double newMinimumInterval = scriptExecutionContext()->minimumTimerInterval();
- double newClampedInterval = intervalClampedToMinimum(m_originalInterval, newMinimumInterval);
</del><ins>+ double previousInterval = m_currentTimerInterval;
+ m_currentTimerInterval = intervalClampedToMinimum();
</ins><span class="cx">
</span><del>- if (repeatInterval()) {
- augmentRepeatInterval(newClampedInterval - repeatInterval());
</del><ins>+ if (previousInterval == m_currentTimerInterval)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- double previousClampedInterval = intervalClampedToMinimum(m_originalInterval, oldMinimumTimerInterval);
- augmentFireInterval(newClampedInterval - previousClampedInterval);
</del><ins>+ if (repeatInterval()) {
+ ASSERT(repeatInterval() == previousInterval);
+ augmentRepeatInterval(m_currentTimerInterval - previousInterval);
+ } else
+ augmentFireInterval(m_currentTimerInterval - previousInterval);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-double DOMTimer::intervalClampedToMinimum(int timeout, double minimumTimerInterval) const
</del><ins>+double DOMTimer::intervalClampedToMinimum() const
</ins><span class="cx"> {
</span><ins>+ ASSERT(scriptExecutionContext());
</ins><span class="cx"> ASSERT(m_nestingLevel <= maxTimerNestingLevel);
</span><span class="cx">
</span><del>- double intervalMilliseconds = std::max(oneMillisecond, timeout * oneMillisecond);
</del><ins>+ double minimumTimerInterval = scriptExecutionContext()->minimumTimerInterval();
+ double intervalMilliseconds = std::max(oneMillisecond, m_originalInterval * oneMillisecond);
</ins><span class="cx">
</span><del>- if (intervalMilliseconds < minimumTimerInterval && m_nestingLevel >= maxTimerNestingLevel)
</del><ins>+ if (intervalMilliseconds < minimumTimerInterval && m_nestingLevel == maxTimerNestingLevel)
</ins><span class="cx"> intervalMilliseconds = minimumTimerInterval;
</span><span class="cx"> return intervalMilliseconds;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h (175110 => 175111)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h 2014-10-23 09:28:01 UTC (rev 175110)
+++ branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h 2014-10-23 09:29:10 UTC (rev 175111)
</span><span class="lines">@@ -44,14 +44,13 @@
</span><span class="cx"> static int install(ScriptExecutionContext*, std::unique_ptr<ScheduledAction>, int timeout, bool singleShot);
</span><span class="cx"> static void removeById(ScriptExecutionContext*, int timeoutId);
</span><span class="cx">
</span><del>- // Adjust to a change in the ScriptExecutionContext's minimum timer interval.
- // This allows the minimum allowable interval time to be changed in response
- // to events like moving a tab to the background.
- void adjustMinimumTimerInterval(double oldMinimumTimerInterval);
</del><ins>+ // Notify that the interval may need updating (e.g. because the minimum interval
+ // setting for the context has changed).
+ void updateTimerIntervalIfNecessary();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DOMTimer(ScriptExecutionContext*, std::unique_ptr<ScheduledAction>, int interval, bool singleShot);
</span><del>- double intervalClampedToMinimum(int timeout, double minimumTimerInterval) const;
</del><ins>+ double intervalClampedToMinimum() const;
</ins><span class="cx">
</span><span class="cx"> // SuspendableTimer
</span><span class="cx"> virtual void fired() override;
</span><span class="lines">@@ -62,6 +61,7 @@
</span><span class="cx"> int m_nestingLevel;
</span><span class="cx"> std::unique_ptr<ScheduledAction> m_action;
</span><span class="cx"> int m_originalInterval;
</span><ins>+ double m_currentTimerInterval;
</ins><span class="cx"> bool m_shouldForwardUserGesture;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>