<!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>[209675] 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/209675">209675</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-12-10 14:29:24 -0800 (Sat, 10 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Animation followed by transition doesn't always fire transitionend event
https://bugs.webkit.org/show_bug.cgi?id=165731
rdar://problem/28471240
Reviewed by Zalan Bujtas.
Source/WebCore:
After <a href="http://trac.webkit.org/projects/webkit/changeset/200047">r200047</a>, a keyframe animation of an accelerated property followed by a
transition didn't always fire a transitionend event.
This happened if CompositeAnimation::timeToNextService() happend to be called
when the transitions's timeToNextService() returned a positive value, but the
keyframe animation still existed, but its timeToNextService() returned -1. In
this case that -1 would clobber the positing minT.
Fix by just continuing in each loop when the timeToNextService() returns -1.
This code should probably be rewritten to use std::optional<double> rather than
magic values.
Test: animations/animation-followed-by-transition.html
* page/animation/CompositeAnimation.cpp:
(WebCore::CompositeAnimation::timeToNextService):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::pauseAnimation):
(WebCore::GraphicsLayerCA::removeAnimation):
(WebCore::GraphicsLayerCA::platformCALayerAnimationStarted):
(WebCore::GraphicsLayerCA::platformCALayerAnimationEnded):
LayoutTests:
* animations/animation-followed-by-transition-expected.txt: Added.
* animations/animation-followed-by-transition.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="#trunkSourceWebCorepageanimationCompositeAnimationcpp">trunk/Source/WebCore/page/animation/CompositeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsanimationfollowedbytransitionexpectedtxt">trunk/LayoutTests/animations/animation-followed-by-transition-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationsanimationfollowedbytransitionhtml">trunk/LayoutTests/animations/animation-followed-by-transition.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209674 => 209675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-10 22:13:58 UTC (rev 209674)
+++ trunk/LayoutTests/ChangeLog 2016-12-10 22:29:24 UTC (rev 209675)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-10 Simon Fraser <simon.fraser@apple.com>
+
+ Animation followed by transition doesn't always fire transitionend event
+ https://bugs.webkit.org/show_bug.cgi?id=165731
+ rdar://problem/28471240
+
+ Reviewed by Zalan Bujtas.
+
+ * animations/animation-followed-by-transition-expected.txt: Added.
+ * animations/animation-followed-by-transition.html: Added.
+
</ins><span class="cx"> 2016-12-09 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Remove custom bindings for Geolocation
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsanimationfollowedbytransitionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/animation-followed-by-transition-expected.txt (0 => 209675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/animation-followed-by-transition-expected.txt (rev 0)
+++ trunk/LayoutTests/animations/animation-followed-by-transition-expected.txt 2016-12-10 22:29:24 UTC (rev 209675)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+Should see animationend followed by transitionend.
+
+animationend
+transitionend
+
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsanimationfollowedbytransitionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/animation-followed-by-transition.html (0 => 209675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/animation-followed-by-transition.html (rev 0)
+++ trunk/LayoutTests/animations/animation-followed-by-transition.html 2016-12-10 22:29:24 UTC (rev 209675)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ #test {
+ position: absolute;
+ top: 100px;
+ left: 100px;
+ height: 100px;
+ width: 100px;
+ background: green;
+ transition: transform 40ms;
+ transform: translate3d(0,0,0);
+ animation: slideInUp 50ms;
+ }
+
+ #test.trans {
+ transform: translateX(200%);
+ }
+
+ @keyframes slideInUp {
+ 0% {
+ transform: translate3d(-100%, 0, 0);
+ }
+ 100% {
+ transform: translate3d(0, 0, 0);
+ }
+ }
+ </style>
+</head>
+<body>
+ <div id="test"></div>
+<p>Should see animationend followed by transitionend.</p>
+<pre id="logging"></pre>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doLog(s)
+ {
+ document.getElementById('logging').textContent += s + '\n';
+ }
+
+ var testDiv = document.getElementById('test');
+ testDiv.addEventListener("transitionend", function() {
+ doLog("transitionend");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+
+ testDiv.addEventListener("animationend", function() {
+ doLog("animationend");
+ window.setTimeout(function() {
+ testDiv.classList.add('trans');
+ }, 0)
+
+ // Watchdog timer.
+ window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 500)
+ });
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209674 => 209675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-10 22:13:58 UTC (rev 209674)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 22:29:24 UTC (rev 209675)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-12-10 Simon Fraser <simon.fraser@apple.com>
+
+ Animation followed by transition doesn't always fire transitionend event
+ https://bugs.webkit.org/show_bug.cgi?id=165731
+ rdar://problem/28471240
+
+ Reviewed by Zalan Bujtas.
+
+ After r200047, a keyframe animation of an accelerated property followed by a
+ transition didn't always fire a transitionend event.
+
+ This happened if CompositeAnimation::timeToNextService() happend to be called
+ when the transitions's timeToNextService() returned a positive value, but the
+ keyframe animation still existed, but its timeToNextService() returned -1. In
+ this case that -1 would clobber the positing minT.
+
+ Fix by just continuing in each loop when the timeToNextService() returns -1.
+
+ This code should probably be rewritten to use std::optional<double> rather than
+ magic values.
+
+ Test: animations/animation-followed-by-transition.html
+
+ * page/animation/CompositeAnimation.cpp:
+ (WebCore::CompositeAnimation::timeToNextService):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::addAnimation):
+ (WebCore::GraphicsLayerCA::pauseAnimation):
+ (WebCore::GraphicsLayerCA::removeAnimation):
+ (WebCore::GraphicsLayerCA::platformCALayerAnimationStarted):
+ (WebCore::GraphicsLayerCA::platformCALayerAnimationEnded):
+
</ins><span class="cx"> 2016-12-10 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Merge JSDictionary into Dictionary, and remove unused bits
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCompositeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CompositeAnimation.cpp (209674 => 209675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2016-12-10 22:13:58 UTC (rev 209674)
+++ trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2016-12-10 22:29:24 UTC (rev 209675)
</span><span class="lines">@@ -375,6 +375,8 @@
</span><span class="cx"> if (!m_transitions.isEmpty()) {
</span><span class="cx"> for (auto& transition : m_transitions.values()) {
</span><span class="cx"> double t = transition->timeToNextService();
</span><ins>+ if (t == -1)
+ continue;
</ins><span class="cx"> if (t < minT || minT == -1)
</span><span class="cx"> minT = t;
</span><span class="cx"> if (minT == 0)
</span><span class="lines">@@ -385,6 +387,8 @@
</span><span class="cx"> m_keyframeAnimations.checkConsistency();
</span><span class="cx"> for (auto& animation : m_keyframeAnimations.values()) {
</span><span class="cx"> double t = animation->timeToNextService();
</span><ins>+ if (t == -1)
+ continue;
</ins><span class="cx"> if (t < minT || minT == -1)
</span><span class="cx"> minT = t;
</span><span class="cx"> if (minT == 0)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (209674 => 209675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-12-10 22:13:58 UTC (rev 209674)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-12-10 22:29:24 UTC (rev 209675)
</span><span class="lines">@@ -936,6 +936,8 @@
</span><span class="cx">
</span><span class="cx"> bool GraphicsLayerCA::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& animationName, double timeOffset)
</span><span class="cx"> {
</span><ins>+ LOG(Animations, "GraphicsLayerCA %p addAnimation %s (can be accelerated %d)", this, animationName.utf8().data(), animationCanBeAccelerated(valueList, anim));
+
</ins><span class="cx"> ASSERT(!animationName.isEmpty());
</span><span class="cx">
</span><span class="cx"> if (!animationCanBeAccelerated(valueList, anim))
</span><span class="lines">@@ -965,6 +967,8 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::pauseAnimation(const String& animationName, double timeOffset)
</span><span class="cx"> {
</span><ins>+ LOG(Animations, "GraphicsLayerCA %p pauseAnimation %s (running %d)", this, animationName.utf8().data(), animationIsRunning(animationName));
+
</ins><span class="cx"> if (!animationIsRunning(animationName))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -982,6 +986,8 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::removeAnimation(const String& animationName)
</span><span class="cx"> {
</span><ins>+ LOG(Animations, "GraphicsLayerCA %p removeAnimation %s (running %d)", this, animationName.utf8().data(), animationIsRunning(animationName));
+
</ins><span class="cx"> if (!animationIsRunning(animationName))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -991,11 +997,13 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::platformCALayerAnimationStarted(const String& animationKey, CFTimeInterval startTime)
</span><span class="cx"> {
</span><ins>+ LOG(Animations, "GraphicsLayerCA %p platformCALayerAnimationStarted %s at %f", this, animationKey.utf8().data(), startTime);
</ins><span class="cx"> client().notifyAnimationStarted(this, animationKey, startTime);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::platformCALayerAnimationEnded(const String& animationKey)
</span><span class="cx"> {
</span><ins>+ LOG(Animations, "GraphicsLayerCA %p platformCALayerAnimationEnded %s", this, animationKey.utf8().data());
</ins><span class="cx"> client().notifyAnimationEnded(this, animationKey);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>