<!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>[200042] 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/200042">200042</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-25 13:06:04 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Negative animation-delay is treated as 0s
https://bugs.webkit.org/show_bug.cgi?id=141008
Reviewed by Daniel Bates.
Source/WebCore:
Fix keyframe animations which start in the paused state.
Explicitly move such animations from the new to the paused state, and
set m_pauseTime to 0, rather than leaving it at -1. Fix getElapsedTime()
to compute a correct time elapsed time for such animations, which takes
negative delay into account correctly.
Fix assertions which need to account for the new transition of New -> PlayStatePaused.
Test: animations/play-state-start-paused.html
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::updateStateMachine):
(WebCore::AnimationBase::getElapsedTime):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::animate):
LayoutTests:
Ref test that has an initially-paused animation on 'left' and with a
3d transform.
* animations/play-state-start-paused-expected.html: Added.
* animations/play-state-start-paused.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="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsplaystatestartpausedexpectedhtml">trunk/LayoutTests/animations/play-state-start-paused-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsplaystatestartpausedhtml">trunk/LayoutTests/animations/play-state-start-paused.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200041 => 200042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-25 19:49:23 UTC (rev 200041)
+++ trunk/LayoutTests/ChangeLog 2016-04-25 20:06:04 UTC (rev 200042)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-25 Simon Fraser <simon.fraser@apple.com>
+
+ Negative animation-delay is treated as 0s
+ https://bugs.webkit.org/show_bug.cgi?id=141008
+
+ Reviewed by Daniel Bates.
+
+ Ref test that has an initially-paused animation on 'left' and with a
+ 3d transform.
+
+ * animations/play-state-start-paused-expected.html: Added.
+ * animations/play-state-start-paused.html: Added.
+
</ins><span class="cx"> 2016-04-25 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement latest File object spec (including its constructor).
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsplaystatestartpausedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/play-state-start-paused-expected.html (0 => 200042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/play-state-start-paused-expected.html (rev 0)
+++ trunk/LayoutTests/animations/play-state-start-paused-expected.html 2016-04-25 20:06:04 UTC (rev 200042)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .container {
+ height: 100px;
+ width: 500px;
+ margin: 4px;
+ border: 1px solid black;
+ }
+ .box {
+ position: relative;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+ }
+
+ .mover {
+ left: 200px;
+ }
+
+ .slider {
+ transform: translate3d(200px, 0, 0);
+ }
+ </style>
+</head>
+<body>
+ <div class="container">
+ <div class="mover box"></div>
+ </div>
+ <div class="container">
+ <div class="slider box"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsplaystatestartpausedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/play-state-start-paused.html (0 => 200042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/play-state-start-paused.html (rev 0)
+++ trunk/LayoutTests/animations/play-state-start-paused.html 2016-04-25 20:06:04 UTC (rev 200042)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .container {
+ height: 100px;
+ width: 500px;
+ margin: 4px;
+ border: 1px solid black;
+ }
+ .box {
+ position: relative;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+ animation-delay: -0.5s;
+ animation-play-state: paused;
+ }
+
+ /* For manual testing. */
+ .container:hover .box {
+ animation-play-state: running;
+ }
+
+ .mover {
+ animation: move 1s linear;
+ }
+
+ .slider {
+ animation: slide 1s linear;
+ }
+
+ @keyframes move {
+ from { left: 0; }
+ to { left: 400px; }
+ }
+
+ @keyframes slide {
+ from { transform: translate3d(0, 0, 0); }
+ to { transform: translate3d(400px, 0, 0); }
+ }
+ </style>
+</head>
+<body>
+ <div class="container">
+ <div class="mover box"></div>
+ </div>
+ <div class="container">
+ <div class="slider box"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200041 => 200042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-25 19:49:23 UTC (rev 200041)
+++ trunk/Source/WebCore/ChangeLog 2016-04-25 20:06:04 UTC (rev 200042)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-04-25 Simon Fraser <simon.fraser@apple.com>
+
+ Negative animation-delay is treated as 0s
+ https://bugs.webkit.org/show_bug.cgi?id=141008
+
+ Reviewed by Daniel Bates.
+
+ Fix keyframe animations which start in the paused state.
+
+ Explicitly move such animations from the new to the paused state, and
+ set m_pauseTime to 0, rather than leaving it at -1. Fix getElapsedTime()
+ to compute a correct time elapsed time for such animations, which takes
+ negative delay into account correctly.
+
+ Fix assertions which need to account for the new transition of New -> PlayStatePaused.
+
+ Test: animations/play-state-start-paused.html
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::updateStateMachine):
+ (WebCore::AnimationBase::getElapsedTime):
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::animate):
+
</ins><span class="cx"> 2016-04-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline RenderStyle into RenderElement
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (200041 => 200042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2016-04-25 19:49:23 UTC (rev 200041)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2016-04-25 20:06:04 UTC (rev 200042)
</span><span class="lines">@@ -219,6 +219,7 @@
</span><span class="cx"> // We are pausing before we even started.
</span><span class="cx"> LOG(Animations, "%p AnimationState %s -> AnimationState::PausedNew", this, nameForState(m_animationState));
</span><span class="cx"> m_animationState = AnimationState::PausedNew;
</span><ins>+ m_pauseTime = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="lines">@@ -388,7 +389,7 @@
</span><span class="cx"> // AnimationState::PausedWaitResponse, we don't yet have a valid startTime, so we send 0 to startAnimation.
</span><span class="cx"> // When the AnimationStateInput::StartTimeSet comes in and we were in AnimationState::PausedRun, we will notice
</span><span class="cx"> // that we have already set the startTime and will ignore it.
</span><del>- ASSERT(input == AnimationStateInput::PlayStateRunning || input == AnimationStateInput::StartTimeSet || input == AnimationStateInput::StyleAvailable || input == AnimationStateInput::StartAnimation);
</del><ins>+ ASSERT(input == AnimationStateInput::PlayStatePaused || input == AnimationStateInput::PlayStateRunning || input == AnimationStateInput::StartTimeSet || input == AnimationStateInput::StyleAvailable || input == AnimationStateInput::StartAnimation);
</ins><span class="cx"> ASSERT(paused());
</span><span class="cx">
</span><span class="cx"> if (input == AnimationStateInput::PlayStateRunning) {
</span><span class="lines">@@ -397,6 +398,7 @@
</span><span class="cx"> // to start, so jump back to the New state and reset.
</span><span class="cx"> LOG(Animations, "%p AnimationState %s -> AnimationState::New", this, nameForState(m_animationState));
</span><span class="cx"> m_animationState = AnimationState::New;
</span><ins>+ m_pauseTime = -1;
</ins><span class="cx"> updateStateMachine(input, param);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -406,6 +408,7 @@
</span><span class="cx"> m_startTime += beginAnimationUpdateTime() - m_pauseTime;
</span><span class="cx"> else
</span><span class="cx"> m_startTime = 0;
</span><ins>+
</ins><span class="cx"> m_pauseTime = -1;
</span><span class="cx">
</span><span class="cx"> if (m_animationState == AnimationState::PausedWaitStyleAvailable) {
</span><span class="lines">@@ -446,7 +449,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(m_animationState == AnimationState::PausedWaitStyleAvailable);
</del><ins>+ ASSERT(m_animationState == AnimationState::PausedNew || m_animationState == AnimationState::PausedWaitStyleAvailable);
</ins><span class="cx"> // We are paused but we got the callback that notifies us that style has been updated.
</span><span class="cx"> // We move to the AnimationState::PausedWaitResponse state
</span><span class="cx"> LOG(Animations, "%p AnimationState %s -> PausedWaitResponse", this, nameForState(m_animationState));
</span><span class="lines">@@ -741,10 +744,14 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (paused())
- return m_pauseTime - m_startTime;
</del><ins>+ if (paused()) {
+ double delayOffset = (!m_startTime && m_animation->delay() < 0) ? m_animation->delay() : 0;
+ return m_pauseTime - m_startTime - delayOffset;
+ }
+
</ins><span class="cx"> if (m_startTime <= 0)
</span><span class="cx"> return 0;
</span><ins>+
</ins><span class="cx"> if (postActive() || fillingForwards())
</span><span class="cx"> return m_totalDuration;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (200041 => 200042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-04-25 19:49:23 UTC (rev 200041)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-04-25 20:06:04 UTC (rev 200042)
</span><span class="lines">@@ -131,8 +131,12 @@
</span><span class="cx"> fireAnimationEventsIfNeeded();
</span><span class="cx">
</span><span class="cx"> // If we have not yet started, we will not have a valid start time, so just start the animation if needed.
</span><del>- if (isNew() && m_animation->playState() == AnimPlayStatePlaying && !compositeAnimation->isSuspended())
- updateStateMachine(AnimationStateInput::StartAnimation, -1);
</del><ins>+ if (isNew()) {
+ if (m_animation->playState() == AnimPlayStatePlaying && !compositeAnimation->isSuspended())
+ updateStateMachine(AnimationStateInput::StartAnimation, -1);
+ else if (m_animation->playState() == AnimPlayStatePaused)
+ updateStateMachine(AnimationStateInput::PlayStatePaused, -1);
+ }
</ins><span class="cx">
</span><span class="cx"> // If we get this far and the animation is done, it means we are cleaning up a just finished animation.
</span><span class="cx"> // If so, we need to send back the targetStyle.
</span></span></pre>
</div>
</div>
</body>
</html>