<!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>[287554] 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/287554">287554</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2022-01-03 13:49:37 -0800 (Mon, 03 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/287550">r287550</a>.
https://bugs.webkit.org/show_bug.cgi?id=234829

Reverted changeset:

"[Web Animations] changing the effect of a transition should
no longer have it marked as running"
https://bugs.webkit.org/show_bug.cgi?id=234823
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/287550">r287550</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscsstransitionsCSSTransitioneffecttentativeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreanimationDeclarativeAnimationcpp">trunk/Source/WebCore/animation/DeclarativeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreanimationDeclarativeAnimationh">trunk/Source/WebCore/animation/DeclarativeAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreanimationWebAnimationh">trunk/Source/WebCore/animation/WebAnimation.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (287553 => 287554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2022-01-03 21:47:42 UTC (rev 287553)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2022-01-03 21:49:37 UTC (rev 287554)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2022-01-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r287550.
+        https://bugs.webkit.org/show_bug.cgi?id=234829
+
+
+        Reverted changeset:
+
+        "[Web Animations] changing the effect of a transition should
+        no longer have it marked as running"
+        https://bugs.webkit.org/show_bug.cgi?id=234823
+        https://commits.webkit.org/r287550
+
</ins><span class="cx"> 2022-01-03  Antoine Quint  <graouts@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed test gardening, this test progressed in the way it fails but the test expectation
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscsstransitionsCSSTransitioneffecttentativeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative-expected.txt (287553 => 287554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative-expected.txt        2022-01-03 21:47:42 UTC (rev 287553)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transitions/CSSTransition-effect.tentative-expected.txt   2022-01-03 21:49:37 UTC (rev 287554)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> PASS After setting a transition's effect to null, it still reports the original transition property
</span><span class="cx"> PASS After setting a transition's effect to null, it becomes finished
</span><span class="cx"> PASS After setting a transition's effect to null, style is updated
</span><del>-PASS After setting a transition's effect to null, a new transition can be started
</del><ins>+FAIL After setting a transition's effect to null, a new transition can be started assert_equals: expected "100px" but got "0px"
</ins><span class="cx"> PASS After setting a transition's effect to null, it should be possible to interrupt that transition
</span><span class="cx"> PASS After setting a new keyframe effect with a shorter duration, the transition becomes finished
</span><span class="cx"> PASS After setting a new keyframe effect targeting different properties, the transition continues to report the original transition property
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (287553 => 287554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2022-01-03 21:47:42 UTC (rev 287553)
+++ trunk/Source/WebCore/ChangeLog      2022-01-03 21:49:37 UTC (rev 287554)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2022-01-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r287550.
+        https://bugs.webkit.org/show_bug.cgi?id=234829
+
+
+        Reverted changeset:
+
+        "[Web Animations] changing the effect of a transition should
+        no longer have it marked as running"
+        https://bugs.webkit.org/show_bug.cgi?id=234823
+        https://commits.webkit.org/r287550
+
</ins><span class="cx"> 2022-01-03  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add resolved/unresolved color type accessors to require users to be explicit about whether they will handle missing/none color components
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationDeclarativeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/DeclarativeAnimation.cpp (287553 => 287554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/DeclarativeAnimation.cpp  2022-01-03 21:47:42 UTC (rev 287553)
+++ trunk/Source/WebCore/animation/DeclarativeAnimation.cpp     2022-01-03 21:49:37 UTC (rev 287554)
</span><span class="lines">@@ -235,17 +235,6 @@
</span><span class="cx">     disassociateFromOwningElement();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DeclarativeAnimation::setEffect(RefPtr<AnimationEffect>&& newEffect)
-{
-    if (effect() == newEffect)
-        return;
-
-    WebAnimation::setEffect(WTFMove(newEffect));
-
-    if (auto styleable = owningElement())
-        styleable->removeDeclarativeAnimationFromListsForOwningElement(*this);
-}
-
</del><span class="cx"> AnimationEffectPhase DeclarativeAnimation::phaseWithoutEffect() const
</span><span class="cx"> {
</span><span class="cx">     // This shouldn't be called if we actually have an effect.
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationDeclarativeAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/DeclarativeAnimation.h (287553 => 287554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/DeclarativeAnimation.h    2022-01-03 21:47:42 UTC (rev 287553)
+++ trunk/Source/WebCore/animation/DeclarativeAnimation.h       2022-01-03 21:49:37 UTC (rev 287554)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx">     ExceptionOr<void> bindingsPause() override;
</span><span class="cx"> 
</span><span class="cx">     void setTimeline(RefPtr<AnimationTimeline>&&) final;
</span><del>-    void setEffect(RefPtr<AnimationEffect>&&) final;
</del><span class="cx">     void cancel() final;
</span><span class="cx"> 
</span><span class="cx">     void tick() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationWebAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/WebAnimation.h (287553 => 287554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/WebAnimation.h    2022-01-03 21:47:42 UTC (rev 287553)
+++ trunk/Source/WebCore/animation/WebAnimation.h       2022-01-03 21:49:37 UTC (rev 287554)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">     AnimationEffect* bindingsEffect() const { return effect(); }
</span><span class="cx">     virtual void setBindingsEffect(RefPtr<AnimationEffect>&&);
</span><span class="cx">     AnimationEffect* effect() const { return m_effect.get(); }
</span><del>-    virtual void setEffect(RefPtr<AnimationEffect>&&);
</del><ins>+    void setEffect(RefPtr<AnimationEffect>&&);
</ins><span class="cx">     AnimationTimeline* timeline() const { return m_timeline.get(); }
</span><span class="cx">     virtual void setTimeline(RefPtr<AnimationTimeline>&&);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>