<!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>[178014] trunk</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/178014">178014</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 18:08:23 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only throttle DOM timers if they change CSS properties that cannot cause non-descendant elements to become visible
https://bugs.webkit.org/show_bug.cgi?id=140142
Reviewed by Darin Adler.
Source/WebCore:
Only throttle DOM timers if they change CSS properties that cannot cause
non-descendant elements to become visible. For example, a DOM timer may
change the height of an element that is outside the viewport. However,
changing its height may causes elements inside the viewport to move. As
such, we should NOT throttle such DOM timer.
With this patch, we only mark a repeating timer as candidate for
throttling if it is updating one of the following CSS properties:
left, right, top, bottom, webkit-transform, opacity.
Test: fast/dom/timer-height-change-no-throttling.html
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
(WebCore::propertyChangeMayRepaintNonDescendants):
(WebCore::JSCSSStyleDeclaration::putDelegate):
* page/DOMTimer.cpp:
(WebCore::DOMTimer::scriptDidCauseElementRepaint):
* page/DOMTimer.h:
LayoutTests:
Add a layout test to make sure that a DOM timer changing the 'height'
property of an element outside the viewport does not get throttled.
* fast/dom/timer-height-change-no-throttling-expected.txt: Added.
* fast/dom/timer-height-change-no-throttling.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimerh">trunk/Source/WebCore/page/DOMTimer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomtimerheightchangenothrottlingexpectedtxt">trunk/LayoutTests/fast/dom/timer-height-change-no-throttling-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomtimerheightchangenothrottlinghtml">trunk/LayoutTests/fast/dom/timer-height-change-no-throttling.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178013 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-07 02:06:19 UTC (rev 178013)
+++ trunk/LayoutTests/ChangeLog 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-01-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Only throttle DOM timers if they change CSS properties that cannot cause non-descendant elements to become visible
+ https://bugs.webkit.org/show_bug.cgi?id=140142
+
+ Reviewed by Darin Adler.
+
+ Add a layout test to make sure that a DOM timer changing the 'height'
+ property of an element outside the viewport does not get throttled.
+
+ * fast/dom/timer-height-change-no-throttling-expected.txt: Added.
+ * fast/dom/timer-height-change-no-throttling.html: Added.
+
+2015-01-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Do not attempt to revalidate cached main resource on back/forward navigation
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139263
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomtimerheightchangenothrottlingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/timer-height-change-no-throttling-expected.txt (0 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/timer-height-change-no-throttling-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/timer-height-change-no-throttling-expected.txt 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests that a repeating timer changing the height of an element outside viewport does not get throttled.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS internals.isTimerThrottled(timeoutId) is false
+PASS internals.isTimerThrottled(timeoutId) is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+TEST
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomtimerheightchangenothrottlinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/timer-height-change-no-throttling.html (0 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/timer-height-change-no-throttling.html (rev 0)
+++ trunk/LayoutTests/fast/dom/timer-height-change-no-throttling.html 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<div style="position: relative; width: 1600px; height: 2400px; background-color: green;">
+ <div style="position:absolute; left: 600px; top: 800px;">
+ <div id="testElement">TEST</div>
+ </div>
+</div>
+<script>
+description("Tests that a repeating timer changing the height of an element outside viewport does not get throttled.");
+jsTestIsAsync = true;
+
+var testElement = document.getElementById('testElement');
+var iterationCount = 0;
+var timeoutId;
+
+function timerCallback()
+{
+ ++iterationCount;
+
+ // Change the height of the element while it is outside viewport.
+ testElement.style["height"] = "" + iterationCount;
+
+ // 5 iterations should be sufficient to throttle the timer.
+ if (iterationCount == 5) {
+ // Do not use shouldBeTrue() because it would cause a DOM tree mutation
+ // and unthrottle the timer.
+ shouldBeFalse("internals.isTimerThrottled(timeoutId)");
+ clearInterval(timeoutId);
+ finishJSTest();
+ setTimeout(scrollElementIntoView, 0);
+ }
+}
+
+timeoutId = setInterval(timerCallback, 0);
+shouldBeFalse("internals.isTimerThrottled(timeoutId)");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178013 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 02:06:19 UTC (rev 178013)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-01-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Only throttle DOM timers if they change CSS properties that cannot cause non-descendant elements to become visible
+ https://bugs.webkit.org/show_bug.cgi?id=140142
+
+ Reviewed by Darin Adler.
+
+ Only throttle DOM timers if they change CSS properties that cannot cause
+ non-descendant elements to become visible. For example, a DOM timer may
+ change the height of an element that is outside the viewport. However,
+ changing its height may causes elements inside the viewport to move. As
+ such, we should NOT throttle such DOM timer.
+
+ With this patch, we only mark a repeating timer as candidate for
+ throttling if it is updating one of the following CSS properties:
+ left, right, top, bottom, webkit-transform, opacity.
+
+ Test: fast/dom/timer-height-change-no-throttling.html
+
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ (WebCore::propertyChangeMayRepaintNonDescendants):
+ (WebCore::JSCSSStyleDeclaration::putDelegate):
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::scriptDidCauseElementRepaint):
+ * page/DOMTimer.h:
+
+2015-01-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Add utility method on FrameView that resumes animated images and unthrottles DOM timers
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140151
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (178013 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2015-01-07 02:06:19 UTC (rev 178013)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -320,6 +320,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// We only throttle DOM timers if they animate CSS properties that will only
+// cause the current element (or its descendants) to be repainted.
+static inline bool propertyChangeMayRepaintNonDescendants(CSSPropertyID propertyID)
+{
+ switch (propertyID) {
+ case CSSPropertyBottom:
+ case CSSPropertyLeft:
+ case CSSPropertyOpacity:
+ case CSSPropertyRight:
+ case CSSPropertyTop:
+ case CSSPropertyWebkitTransform:
+ return false;
+ default:
+ return true;
+ }
+}
+
</ins><span class="cx"> bool JSCSSStyleDeclaration::putDelegate(ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot&)
</span><span class="cx"> {
</span><span class="cx"> CSSPropertyInfo propertyInfo = cssPropertyIDForJSCSSPropertyName(propertyName);
</span><span class="lines">@@ -340,12 +357,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><del>- bool changed = impl().setPropertyInternal(static_cast<CSSPropertyID>(propertyInfo.propertyID), propValue, important, ec);
</del><ins>+ CSSPropertyID propertyID = static_cast<CSSPropertyID>(propertyInfo.propertyID);
+ impl().setPropertyInternal(propertyID, propValue, important, ec);
</ins><span class="cx"> setDOMException(exec, ec);
</span><span class="cx">
</span><span class="cx"> // Choke point for interaction with style of element; notify DOMTimer of the event.
</span><span class="cx"> if (auto* element = impl().parentElement())
</span><del>- DOMTimer::scriptDidCauseElementRepaint(*element, changed);
</del><ins>+ DOMTimer::scriptDidCauseElementRepaint(*element, propertyChangeMayRepaintNonDescendants(propertyID));
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (178013 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp 2015-01-07 02:06:19 UTC (rev 178013)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -310,18 +310,12 @@
</span><span class="cx"> DOMTimerFireState::current->setScriptMadeNonUserObservableChanges();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTimer::scriptDidCauseElementRepaint(Element& element, bool changed)
</del><ins>+void DOMTimer::scriptDidCauseElementRepaint(Element& element, bool mayRepaintNonDescendants)
</ins><span class="cx"> {
</span><span class="cx"> if (!DOMTimerFireState::current)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!changed) {
- // The script set a CSS property on the Element but it did not cause any change.
- DOMTimerFireState::current->setScriptMadeNonUserObservableChanges();
- return;
- }
-
- if (element.mayCauseRepaintInsideViewport())
</del><ins>+ if (mayRepaintNonDescendants || element.mayCauseRepaintInsideViewport())
</ins><span class="cx"> DOMTimerFireState::current->setScriptMadeUserObservableChanges();
</span><span class="cx"> else
</span><span class="cx"> DOMTimerFireState::current->setScriptMadeNonUserObservableChangesToElement(element);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.h (178013 => 178014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.h 2015-01-07 02:06:19 UTC (rev 178013)
+++ trunk/Source/WebCore/page/DOMTimer.h 2015-01-07 02:08:23 UTC (rev 178014)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> void updateThrottlingStateAfterViewportChange(const IntRect& visibleRect);
</span><span class="cx">
</span><span class="cx"> static void scriptDidInteractWithPlugin(HTMLPlugInElement&);
</span><del>- static void scriptDidCauseElementRepaint(Element&, bool changed = true);
</del><ins>+ static void scriptDidCauseElementRepaint(Element&, bool mayRepaintNonDescendants = false);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DOMTimer(ScriptExecutionContext&, std::unique_ptr<ScheduledAction>, int interval, bool singleShot);
</span></span></pre>
</div>
</div>
</body>
</html>