<!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>[286642] trunk/Source/WebCore</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/286642">286642</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-07 22:28:55 -0800 (Tue, 07 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>ActiveDOMObject::suspendIfNeeded() should not be called in the WebAnimation constructor
https://bugs.webkit.org/show_bug.cgi?id=233932

Reviewed by Chris Dumez.

It is not safe to call ActiveDOMObject::suspendIfNeeded() in a constructor. Since WebAnimation has several subclasses
(DeclarativeAnimation, and then CSSTransition and CSSAnimation deriving from DeclarativeAnimation) each with their own
create() methods, we add a new protected initialize() method which refactors code from the WebAnimation constructor
and is called from the two WebAnimation::create() methods.

DeclarativeAnimation already had an initialize method for common setup for the create() methods in CSSTransition and
CSS Animation, so we can simply call WebAnimation::initialize() from DeclarativeAnimation::initialize() and this guarantees
all create() methods for WebAnimation and all of its subclasses are correctly calling ActiveDOMObject::suspendIfNeeded().

* animation/DeclarativeAnimation.cpp:
(WebCore::DeclarativeAnimation::initialize):
* animation/DeclarativeAnimation.h:
* animation/WebAnimation.cpp:
(WebCore::WebAnimation::create):
(WebCore::WebAnimation::initialize):
(WebCore::WebAnimation::WebAnimation):
* animation/WebAnimation.h:</pre>

<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreanimationWebAnimationcpp">trunk/Source/WebCore/animation/WebAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreanimationWebAnimationh">trunk/Source/WebCore/animation/WebAnimation.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286641 => 286642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-08 05:30:53 UTC (rev 286641)
+++ trunk/Source/WebCore/ChangeLog      2021-12-08 06:28:55 UTC (rev 286642)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2021-12-07  Antoine Quint  <graouts@webkit.org>
+
+        ActiveDOMObject::suspendIfNeeded() should not be called in the WebAnimation constructor
+        https://bugs.webkit.org/show_bug.cgi?id=233932
+
+        Reviewed by Chris Dumez.
+
+        It is not safe to call ActiveDOMObject::suspendIfNeeded() in a constructor. Since WebAnimation has several subclasses
+        (DeclarativeAnimation, and then CSSTransition and CSSAnimation deriving from DeclarativeAnimation) each with their own
+        create() methods, we add a new protected initialize() method which refactors code from the WebAnimation constructor
+        and is called from the two WebAnimation::create() methods.
+
+        DeclarativeAnimation already had an initialize method for common setup for the create() methods in CSSTransition and
+        CSS Animation, so we can simply call WebAnimation::initialize() from DeclarativeAnimation::initialize() and this guarantees
+        all create() methods for WebAnimation and all of its subclasses are correctly calling ActiveDOMObject::suspendIfNeeded().
+
+        * animation/DeclarativeAnimation.cpp:
+        (WebCore::DeclarativeAnimation::initialize):
+        * animation/DeclarativeAnimation.h:
+        * animation/WebAnimation.cpp:
+        (WebCore::WebAnimation::create):
+        (WebCore::WebAnimation::initialize):
+        (WebCore::WebAnimation::WebAnimation):
+        * animation/WebAnimation.h:
+
</ins><span class="cx"> 2021-12-07  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add support for `navigator.requestCookieConsent()` behind a disabled feature flag
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationDeclarativeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/DeclarativeAnimation.cpp (286641 => 286642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/DeclarativeAnimation.cpp  2021-12-08 05:30:53 UTC (rev 286641)
+++ trunk/Source/WebCore/animation/DeclarativeAnimation.cpp     2021-12-08 06:28:55 UTC (rev 286642)
</span><span class="lines">@@ -107,6 +107,8 @@
</span><span class="cx"> 
</span><span class="cx"> void DeclarativeAnimation::initialize(const RenderStyle* oldStyle, const RenderStyle& newStyle, const Style::ResolutionContext& resolutionContext)
</span><span class="cx"> {
</span><ins>+    WebAnimation::initialize();
+
</ins><span class="cx">     // We need to suspend invalidation of the animation's keyframe effect during its creation
</span><span class="cx">     // as it would otherwise trigger invalidation of the document's style and this would be
</span><span class="cx">     // incorrect since it would happen during style invalidation.
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationDeclarativeAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/DeclarativeAnimation.h (286641 => 286642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/DeclarativeAnimation.h    2021-12-08 05:30:53 UTC (rev 286641)
+++ trunk/Source/WebCore/animation/DeclarativeAnimation.h       2021-12-08 06:28:55 UTC (rev 286642)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> protected:
</span><span class="cx">     DeclarativeAnimation(const Styleable&, const Animation&);
</span><span class="cx"> 
</span><del>-    virtual void initialize(const RenderStyle* oldStyle, const RenderStyle& newStyle, const Style::ResolutionContext&);
</del><ins>+    void initialize(const RenderStyle* oldStyle, const RenderStyle& newStyle, const Style::ResolutionContext&);
</ins><span class="cx">     virtual void syncPropertiesWithBackingAnimation();
</span><span class="cx">     // elapsedTime is the animation's current time at the time the event is added and is exposed through the DOM API, timelineTime is the animations'
</span><span class="cx">     // timeline current time and is not exposed through the DOM API but used by the DocumentTimeline for sorting events before dispatch. 
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationWebAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/WebAnimation.cpp (286641 => 286642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/WebAnimation.cpp  2021-12-08 05:30:53 UTC (rev 286641)
+++ trunk/Source/WebCore/animation/WebAnimation.cpp     2021-12-08 06:28:55 UTC (rev 286642)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> Ref<WebAnimation> WebAnimation::create(Document& document, AnimationEffect* effect)
</span><span class="cx"> {
</span><span class="cx">     auto result = adoptRef(*new WebAnimation(document));
</span><ins>+    result->initialize();
</ins><span class="cx">     result->setEffect(effect);
</span><span class="cx">     result->setTimeline(&document.timeline());
</span><span class="cx"> 
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> Ref<WebAnimation> WebAnimation::create(Document& document, AnimationEffect* effect, AnimationTimeline* timeline)
</span><span class="cx"> {
</span><span class="cx">     auto result = adoptRef(*new WebAnimation(document));
</span><ins>+    result->initialize();
</ins><span class="cx">     result->setEffect(effect);
</span><span class="cx">     if (timeline)
</span><span class="cx">         result->setTimeline(timeline);
</span><span class="lines">@@ -86,14 +88,17 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebAnimation::initialize()
+{
+    suspendIfNeeded();
+    m_readyPromise->resolve(*this);
+}
+
</ins><span class="cx"> WebAnimation::WebAnimation(Document& document)
</span><span class="cx">     : ActiveDOMObject(document)
</span><span class="cx">     , m_readyPromise(makeUniqueRef<ReadyPromise>(*this, &WebAnimation::readyPromiseResolve))
</span><span class="cx">     , m_finishedPromise(makeUniqueRef<FinishedPromise>(*this, &WebAnimation::finishedPromiseResolve))
</span><span class="cx"> {
</span><del>-    m_readyPromise->resolve(*this);
-    suspendIfNeeded();
-
</del><span class="cx">     instances().add(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationWebAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/WebAnimation.h (286641 => 286642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/WebAnimation.h    2021-12-08 05:30:53 UTC (rev 286641)
+++ trunk/Source/WebCore/animation/WebAnimation.h       2021-12-08 06:28:55 UTC (rev 286642)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> protected:
</span><span class="cx">     explicit WebAnimation(Document&);
</span><span class="cx"> 
</span><ins>+    void initialize();
</ins><span class="cx">     void enqueueAnimationEvent(Ref<AnimationEventBase>&&);
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>

</body>
</html>