<!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>[185602] 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/185602">185602</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 12:47:49 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/185012">r185012</a>): chat frame in Gmail now says "Something's not right"
https://bugs.webkit.org/show_bug.cgi?id=146025
<rdar://problem/21391412>
Reviewed by Darin Adler.
Only throttle timers in non-visible iframes once they've reached the
max nesting level to avoid throttling critical one-shot timers. This is
consistent with the default DOMTimer throttling behavior that is
defined in the specification.
Power-wise, we are mostly interested in DOMTimers that fire frequently
and cause high CPU usage over an extended period of time anyway.
* dom/Document.cpp:
(WebCore::Document::setTimerThrottlingEnabled):
(WebCore::Document::timerAlignmentInterval):
* dom/Document.h:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::timerAlignmentInterval):
* dom/ScriptExecutionContext.h:
* page/DOMTimer.cpp:
(WebCore::DOMTimer::alignedFireTime):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185601 => 185602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 19:43:11 UTC (rev 185601)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 19:47:49 UTC (rev 185602)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-06-16 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION(r185012): chat frame in Gmail now says "Something's not right"
+ https://bugs.webkit.org/show_bug.cgi?id=146025
+ <rdar://problem/21391412>
+
+ Reviewed by Darin Adler.
+
+ Only throttle timers in non-visible iframes once they've reached the
+ max nesting level to avoid throttling critical one-shot timers. This is
+ consistent with the default DOMTimer throttling behavior that is
+ defined in the specification.
+
+ Power-wise, we are mostly interested in DOMTimers that fire frequently
+ and cause high CPU usage over an extended period of time anyway.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setTimerThrottlingEnabled):
+ (WebCore::Document::timerAlignmentInterval):
+ * dom/Document.h:
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::timerAlignmentInterval):
+ * dom/ScriptExecutionContext.h:
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::alignedFireTime):
+
</ins><span class="cx"> 2015-06-16 sylvain-galineau <galineau@adobe.com>
</span><span class="cx">
</span><span class="cx"> Incorrect order of arguments in initial-letter property
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (185601 => 185602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-06-16 19:43:11 UTC (rev 185601)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-06-16 19:47:49 UTC (rev 185602)
</span><span class="lines">@@ -2760,22 +2760,19 @@
</span><span class="cx"> if (m_isTimerThrottlingEnabled == shouldThrottle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- double previousInterval = timerAlignmentInterval();
-
</del><span class="cx"> m_isTimerThrottlingEnabled = shouldThrottle;
</span><del>-
- if (previousInterval != timerAlignmentInterval())
- didChangeTimerAlignmentInterval();
</del><ins>+ didChangeTimerAlignmentInterval();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-double Document::timerAlignmentInterval() const
</del><ins>+double Document::timerAlignmentInterval(bool hasReachedMaxNestingLevel) const
</ins><span class="cx"> {
</span><del>- if (m_isTimerThrottlingEnabled)
</del><ins>+ // Apply Document-level DOMTimer throttling only if timers have reached their maximum nesting level as the Page may still be visible.
+ if (m_isTimerThrottlingEnabled && hasReachedMaxNestingLevel)
</ins><span class="cx"> return DOMTimer::hiddenPageAlignmentInterval();
</span><span class="cx">
</span><span class="cx"> Page* page = this->page();
</span><span class="cx"> if (!page)
</span><del>- return ScriptExecutionContext::timerAlignmentInterval();
</del><ins>+ return ScriptExecutionContext::timerAlignmentInterval(hasReachedMaxNestingLevel);
</ins><span class="cx"> return page->settings().domTimerAlignmentInterval();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (185601 => 185602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-06-16 19:43:11 UTC (rev 185601)
+++ trunk/Source/WebCore/dom/Document.h 2015-06-16 19:47:49 UTC (rev 185602)
</span><span class="lines">@@ -1301,7 +1301,7 @@
</span><span class="cx">
</span><span class="cx"> virtual double minimumTimerInterval() const override final;
</span><span class="cx">
</span><del>- virtual double timerAlignmentInterval() const override final;
</del><ins>+ virtual double timerAlignmentInterval(bool hasReachedMaxNestingLevel) const override final;
</ins><span class="cx">
</span><span class="cx"> void updateTitle(const StringWithDirection&);
</span><span class="cx"> void updateFocusAppearanceTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (185601 => 185602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-06-16 19:43:11 UTC (rev 185601)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-06-16 19:47:49 UTC (rev 185602)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> timer->didChangeAlignmentInterval();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double ScriptExecutionContext::timerAlignmentInterval() const
</del><ins>+double ScriptExecutionContext::timerAlignmentInterval(bool) const
</ins><span class="cx"> {
</span><span class="cx"> return DOMTimer::defaultAlignmentInterval();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (185601 => 185602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-06-16 19:43:11 UTC (rev 185601)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-06-16 19:47:49 UTC (rev 185602)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> virtual double minimumTimerInterval() const;
</span><span class="cx">
</span><span class="cx"> void didChangeTimerAlignmentInterval();
</span><del>- virtual double timerAlignmentInterval() const;
</del><ins>+ virtual double timerAlignmentInterval(bool hasReachedMaxNestingLevel) const;
</ins><span class="cx">
</span><span class="cx"> virtual EventQueue& eventQueue() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (185601 => 185602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp 2015-06-16 19:43:11 UTC (rev 185601)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2015-06-16 19:47:49 UTC (rev 185602)
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx">
</span><span class="cx"> double DOMTimer::alignedFireTime(double fireTime) const
</span><span class="cx"> {
</span><del>- if (double alignmentInterval = scriptExecutionContext()->timerAlignmentInterval())
</del><ins>+ if (double alignmentInterval = scriptExecutionContext()->timerAlignmentInterval(m_nestingLevel >= maxTimerNestingLevel))
</ins><span class="cx"> return ceil(fireTime / alignmentInterval) * alignmentInterval;
</span><span class="cx">
</span><span class="cx"> return fireTime;
</span></span></pre>
</div>
</div>
</body>
</html>