<!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>[191502] 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/191502">191502</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-10-23 11:29:45 -0700 (Fri, 23 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/187121">r187121</a>): Multiple-keyframe animations not honouring ' forwards' fill-mode
https://bugs.webkit.org/show_bug.cgi?id=150328
Reviewed by Dean Jackson.
Source/WebCore:
AnimationBase::getElapsedTime() for a finished animation would return 1 (a progress),
rather than a time value as the caller expects. Fix it to return the total duration
if the animation has finished. This fixes the bug.
Change CompositeAnimation::pauseAnimationAtTime() to be more permissive, allowing
testing of filling-forwards animations with the pause API.
Test: animations/fill-forwards-end-state.html
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::getElapsedTime):
* page/animation/CompositeAnimation.cpp:
(WebCore::CompositeAnimation::pauseAnimationAtTime):
LayoutTests:
Filling-forwards test with an animation whose duration is greater than one second,
which showed the bug.
* animations/fill-forwards-end-state-expected.txt: Added.
* animations/fill-forwards-end-state.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="#trunkSourceWebCorepageanimationAnimationBasecpp">trunk/Source/WebCore/page/animation/AnimationBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCompositeAnimationcpp">trunk/Source/WebCore/page/animation/CompositeAnimation.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsfillforwardsendstateexpectedtxt">trunk/LayoutTests/animations/fill-forwards-end-state-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationsfillforwardsendstatehtml">trunk/LayoutTests/animations/fill-forwards-end-state.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191501 => 191502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-23 18:07:55 UTC (rev 191501)
+++ trunk/LayoutTests/ChangeLog 2015-10-23 18:29:45 UTC (rev 191502)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-23 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r187121): Multiple-keyframe animations not honouring ' forwards' fill-mode
+ https://bugs.webkit.org/show_bug.cgi?id=150328
+
+ Reviewed by Dean Jackson.
+
+ Filling-forwards test with an animation whose duration is greater than one second,
+ which showed the bug.
+
+ * animations/fill-forwards-end-state-expected.txt: Added.
+ * animations/fill-forwards-end-state.html: Added.
+
</ins><span class="cx"> 2015-10-23 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Support for SVG `beginEvent` event and `onbegin` attribute
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsfillforwardsendstateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/fill-forwards-end-state-expected.txt (0 => 191502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/fill-forwards-end-state-expected.txt (rev 0)
+++ trunk/LayoutTests/animations/fill-forwards-end-state-expected.txt 2015-10-23 18:29:45 UTC (rev 191502)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Fill-forwards state should be the last keyframe state.
+
+PASS - "left" property for "box1" element at 2s saw something close to: 100
+
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsfillforwardsendstatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/fill-forwards-end-state.html (0 => 191502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/fill-forwards-end-state.html (rev 0)
+++ trunk/LayoutTests/animations/fill-forwards-end-state.html 2015-10-23 18:29:45 UTC (rev 191502)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Test animation with multiple concurrent animations</title>
+ <style type="text/css" media="screen">
+ #box1 {
+ position: relative;
+ left: 10px;
+ top: 10px;
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ animation-fill-mode: forwards;
+ animation: anim1 2s 0.2s linear;
+ }
+ @keyframes anim1 {
+ from { left: 100px; }
+ 40% { left: 0px; }
+ 60% { left: 250px; }
+ to { left: 100px; }
+ }
+ </style>
+ <script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
+ <script type="text/javascript" charset="utf-8">
+
+ const expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["anim1", 2.5, "box1", "left", 100, 2],
+ ];
+
+ var disablePauseAnimationAPI = false;
+ runAnimationTest(expectedValues, null, null, disablePauseAnimationAPI);
+ </script>
+</head>
+<body>
+<p>Fill-forwards state should be the last keyframe state.</p>
+<div id="box1"></div>
+<div id="result"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191501 => 191502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-23 18:07:55 UTC (rev 191501)
+++ trunk/Source/WebCore/ChangeLog 2015-10-23 18:29:45 UTC (rev 191502)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-10-23 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r187121): Multiple-keyframe animations not honouring ' forwards' fill-mode
+ https://bugs.webkit.org/show_bug.cgi?id=150328
+
+ Reviewed by Dean Jackson.
+
+ AnimationBase::getElapsedTime() for a finished animation would return 1 (a progress),
+ rather than a time value as the caller expects. Fix it to return the total duration
+ if the animation has finished. This fixes the bug.
+
+ Change CompositeAnimation::pauseAnimationAtTime() to be more permissive, allowing
+ testing of filling-forwards animations with the pause API.
+
+ Test: animations/fill-forwards-end-state.html
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::getElapsedTime):
+ * page/animation/CompositeAnimation.cpp:
+ (WebCore::CompositeAnimation::pauseAnimationAtTime):
+
</ins><span class="cx"> 2015-10-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> A label element not in a document should not label an element in a document
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (191501 => 191502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-10-23 18:07:55 UTC (rev 191501)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-10-23 18:29:45 UTC (rev 191502)
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx"> if (m_startTime <= 0)
</span><span class="cx"> return 0;
</span><span class="cx"> if (postActive() || fillingForwards())
</span><del>- return 1;
</del><ins>+ return m_totalDuration;
</ins><span class="cx">
</span><span class="cx"> return beginAnimationUpdateTime() - m_startTime;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCompositeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CompositeAnimation.cpp (191501 => 191502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2015-10-23 18:07:55 UTC (rev 191501)
+++ trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2015-10-23 18:29:45 UTC (rev 191502)
</span><span class="lines">@@ -518,13 +518,8 @@
</span><span class="cx"> if (!keyframeAnim || !keyframeAnim->running())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- double count = keyframeAnim->m_animation->iterationCount();
- if ((t >= 0.0) && ((count == Animation::IterationCountInfinite) || (t <= count * keyframeAnim->duration()))) {
- keyframeAnim->freezeAtTime(t);
- return true;
- }
-
- return false;
</del><ins>+ keyframeAnim->freezeAtTime(t);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CompositeAnimation::pauseTransitionAtTime(CSSPropertyID property, double t)
</span></span></pre>
</div>
</div>
</body>
</html>