<!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>[197581] 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/197581">197581</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-03-04 12:58:50 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unify determination of page timer alignment
https://bugs.webkit.org/show_bug.cgi?id=155031
Reviewed by Chris Dumez.
Currently this is scattered throughout Page - sites that call setDOMTimerAlignmentInterval have
to determine the correct alignment interval. Instead, replace setDOMTimerAlignmentInterval with
updateDOMTimerAlignmentInterval, and unify the policy decision here.
* page/Page.cpp:
(WebCore::Page::setTimerThrottlingState):
- setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
Also, to simplify always record the timestamp when the state changes.
(WebCore::Page::setTimerAlignmentIntervalIncreaseLimit):
- setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
(WebCore::Page::updateDOMTimerAlignmentInterval):
- Was setDOMTimerAlignmentInterval, now determines the new alignment value.
(WebCore::Page::timerAlignmentIntervalIncreaseTimerFired):
- setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
(WebCore::Page::setDOMTimerAlignmentInterval): Deleted.
- Removed, became updateDOMTimerAlignmentInterval.
* page/Page.h:
- setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
m_timerThrottlingEnabledTime -> m_timerThrottlingStateLastChangedTime</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197580 => 197581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-04 20:19:45 UTC (rev 197580)
+++ trunk/Source/WebCore/ChangeLog 2016-03-04 20:58:50 UTC (rev 197581)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-04 Gavin Barraclough <barraclough@apple.com>
+
+ Unify determination of page timer alignment
+ https://bugs.webkit.org/show_bug.cgi?id=155031
+
+ Reviewed by Chris Dumez.
+
+ Currently this is scattered throughout Page - sites that call setDOMTimerAlignmentInterval have
+ to determine the correct alignment interval. Instead, replace setDOMTimerAlignmentInterval with
+ updateDOMTimerAlignmentInterval, and unify the policy decision here.
+
+ * page/Page.cpp:
+ (WebCore::Page::setTimerThrottlingState):
+ - setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
+ Also, to simplify always record the timestamp when the state changes.
+ (WebCore::Page::setTimerAlignmentIntervalIncreaseLimit):
+ - setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
+ (WebCore::Page::updateDOMTimerAlignmentInterval):
+ - Was setDOMTimerAlignmentInterval, now determines the new alignment value.
+ (WebCore::Page::timerAlignmentIntervalIncreaseTimerFired):
+ - setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
+ (WebCore::Page::setDOMTimerAlignmentInterval): Deleted.
+ - Removed, became updateDOMTimerAlignmentInterval.
+ * page/Page.h:
+ - setDOMTimerAlignmentInterval -> updateDOMTimerAlignmentInterval
+ m_timerThrottlingEnabledTime -> m_timerThrottlingStateLastChangedTime
+
</ins><span class="cx"> 2016-03-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crash seen in iOS simulator tests
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (197580 => 197581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-03-04 20:19:45 UTC (rev 197580)
+++ trunk/Source/WebCore/page/Page.cpp 2016-03-04 20:58:50 UTC (rev 197581)
</span><span class="lines">@@ -1204,21 +1204,18 @@
</span><span class="cx"> {
</span><span class="cx"> if (state == m_timerThrottlingState)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> m_timerThrottlingState = state;
</span><ins>+ m_timerThrottlingStateLastChangedTime = monotonicallyIncreasingTime();
</ins><span class="cx">
</span><del>- if (state != TimerThrottlingState::Disabled) {
- m_timerThrottlingEnabledTime = monotonicallyIncreasingTime();
- setDOMTimerAlignmentInterval(DOMTimer::hiddenPageAlignmentInterval());
- return;
- }
</del><ins>+ updateDOMTimerAlignmentInterval();
</ins><span class="cx">
</span><del>- m_timerThrottlingEnabledTime = 0;
- setDOMTimerAlignmentInterval(DOMTimer::defaultAlignmentInterval());
-
</del><span class="cx"> // When throttling is disabled, release all throttled timers.
</span><del>- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (auto* document = frame->document())
- document->didChangeTimerAlignmentInterval();
</del><ins>+ if (state == TimerThrottlingState::Disabled) {
+ for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (auto* document = frame->document())
+ document->didChangeTimerAlignmentInterval();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1230,22 +1227,38 @@
</span><span class="cx"> // If (m_timerAlignmentIntervalIncreaseLimit < m_timerAlignmentInterval) then we need
</span><span class="cx"> // to update m_timerAlignmentInterval, if greater then need to restart the increase timer.
</span><span class="cx"> if (m_timerThrottlingState == TimerThrottlingState::EnabledIncreasing)
</span><del>- setDOMTimerAlignmentInterval(std::min(m_timerAlignmentIntervalIncreaseLimit, m_timerAlignmentInterval));
</del><ins>+ updateDOMTimerAlignmentInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setDOMTimerAlignmentInterval(double alignmentInterval)
</del><ins>+void Page::updateDOMTimerAlignmentInterval()
</ins><span class="cx"> {
</span><del>- m_timerAlignmentInterval = alignmentInterval;
</del><ins>+ bool needsIncreaseTimer = false;
</ins><span class="cx">
</span><ins>+ switch (m_timerThrottlingState) {
+ case TimerThrottlingState::Disabled:
+ m_timerAlignmentInterval = DOMTimer::defaultAlignmentInterval();
+ break;
+
+ case TimerThrottlingState::Enabled:
+ m_timerAlignmentInterval = DOMTimer::hiddenPageAlignmentInterval();
+ break;
+
+ case TimerThrottlingState::EnabledIncreasing:
+ ASSERT(m_timerThrottlingStateLastChangedTime);
+ double throttledDuration = monotonicallyIncreasingTime() - m_timerThrottlingStateLastChangedTime;
+ double minimumAlignmentInterval = std::max(DOMTimer::hiddenPageAlignmentInterval(), throttledDuration);
+ m_timerAlignmentInterval = std::min(minimumAlignmentInterval, m_timerAlignmentIntervalIncreaseLimit);
+ needsIncreaseTimer = m_timerAlignmentInterval < m_timerAlignmentIntervalIncreaseLimit;
+ }
+
</ins><span class="cx"> // If throttling is enabled, auto-increasing of throttling is enabled, and the auto-increase
</span><span class="cx"> // limit has not yet been reached, and then arm the timer to consider an increase. Time to wait
</span><span class="cx"> // between increases is equal to the current throttle time. Since alinment interval increases
</span><span class="cx"> // exponentially, time between steps is exponential too.
</span><del>- if (m_timerThrottlingState == TimerThrottlingState::EnabledIncreasing && m_timerAlignmentInterval < m_timerAlignmentIntervalIncreaseLimit) {
- if (!m_timerAlignmentIntervalIncreaseTimer.isActive())
- m_timerAlignmentIntervalIncreaseTimer.startOneShot(m_timerAlignmentInterval);
- } else
</del><ins>+ if (!needsIncreaseTimer)
</ins><span class="cx"> m_timerAlignmentIntervalIncreaseTimer.stop();
</span><ins>+ else if (!m_timerAlignmentIntervalIncreaseTimer.isActive())
+ m_timerAlignmentIntervalIncreaseTimer.startOneShot(m_timerAlignmentInterval);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::timerAlignmentIntervalIncreaseTimerFired()
</span><span class="lines">@@ -1253,12 +1266,9 @@
</span><span class="cx"> ASSERT(m_settings->hiddenPageDOMTimerThrottlingAutoIncreases());
</span><span class="cx"> ASSERT(m_timerThrottlingState == TimerThrottlingState::EnabledIncreasing);
</span><span class="cx"> ASSERT(m_timerAlignmentInterval < m_timerAlignmentIntervalIncreaseLimit);
</span><del>- ASSERT(m_timerThrottlingEnabledTime);
</del><span class="cx">
</span><span class="cx"> // Alignment interval is increased to equal the time the page has been throttled, to a limit.
</span><del>- double throttledDuration = monotonicallyIncreasingTime() - m_timerThrottlingEnabledTime;
- double alignmentInterval = std::max(m_timerAlignmentInterval, throttledDuration);
- setDOMTimerAlignmentInterval(std::min(alignmentInterval, m_timerAlignmentIntervalIncreaseLimit));
</del><ins>+ updateDOMTimerAlignmentInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::dnsPrefetchingStateChanged()
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (197580 => 197581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-03-04 20:19:45 UTC (rev 197580)
+++ trunk/Source/WebCore/page/Page.h 2016-03-04 20:58:50 UTC (rev 197581)
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> void hiddenPageDOMTimerThrottlingStateChanged();
</span><span class="cx"> void setTimerThrottlingState(TimerThrottlingState);
</span><span class="cx"> void updateTimerThrottlingState();
</span><del>- void setDOMTimerAlignmentInterval(double);
</del><ins>+ void updateDOMTimerAlignmentInterval();
</ins><span class="cx"> void timerAlignmentIntervalIncreaseTimerFired();
</span><span class="cx">
</span><span class="cx"> const std::unique_ptr<Chrome> m_chrome;
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx"> #endif // ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx">
</span><span class="cx"> TimerThrottlingState m_timerThrottlingState { TimerThrottlingState::Disabled };
</span><del>- double m_timerThrottlingEnabledTime { 0 };
</del><ins>+ double m_timerThrottlingStateLastChangedTime { 0 };
</ins><span class="cx"> double m_timerAlignmentInterval;
</span><span class="cx"> Timer m_timerAlignmentIntervalIncreaseTimer;
</span><span class="cx"> double m_timerAlignmentIntervalIncreaseLimit { 0 };
</span></span></pre>
</div>
</div>
</body>
</html>