<!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>[237231] 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/237231">237231</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2018-10-17 12:06:49 -0700 (Wed, 17 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Web Animations] Do not create a DocumentTimeline to suspend or resume animations
https://bugs.webkit.org/show_bug.cgi?id=190660

Patch by Antoine Quint <graouts@apple.com> on 2018-10-17
Reviewed by Dean Jackson.

We check that there is an existing timeline before trying to suspend or resume its animations, otherwise
we're creating a DocumentTimeline when nothing requires for it to exist. We also have to check that we
suspend animations when a DocumentTimeline is created while the page is not visible.

No new tests as there is no change in behavior here.

* animation/DocumentTimeline.cpp:
(WebCore::DocumentTimeline::DocumentTimeline):
* dom/Document.cpp:
(WebCore::Document::didBecomeCurrentDocumentInFrame):
(WebCore::Document::resume):
* page/Frame.cpp:
(WebCore::Frame::clearTimers):
* page/Page.cpp:
(WebCore::Page::setIsVisibleInternal):
(WebCore::Page::hiddenPageCSSAnimationSuspensionStateChanged):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreanimationDocumentTimelinecpp">trunk/Source/WebCore/animation/DocumentTimeline.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (237230 => 237231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-10-17 19:00:03 UTC (rev 237230)
+++ trunk/Source/WebCore/ChangeLog      2018-10-17 19:06:49 UTC (rev 237231)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2018-10-17  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Do not create a DocumentTimeline to suspend or resume animations
+        https://bugs.webkit.org/show_bug.cgi?id=190660
+
+        Reviewed by Dean Jackson.
+
+        We check that there is an existing timeline before trying to suspend or resume its animations, otherwise
+        we're creating a DocumentTimeline when nothing requires for it to exist. We also have to check that we
+        suspend animations when a DocumentTimeline is created while the page is not visible.
+
+        No new tests as there is no change in behavior here.
+
+        * animation/DocumentTimeline.cpp:
+        (WebCore::DocumentTimeline::DocumentTimeline):
+        * dom/Document.cpp:
+        (WebCore::Document::didBecomeCurrentDocumentInFrame):
+        (WebCore::Document::resume):
+        * page/Frame.cpp:
+        (WebCore::Frame::clearTimers):
+        * page/Page.cpp:
+        (WebCore::Page::setIsVisibleInternal):
+        (WebCore::Page::hiddenPageCSSAnimationSuspensionStateChanged):
+
</ins><span class="cx"> 2018-10-17  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Tiling CSS gradients is slow
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationDocumentTimelinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/DocumentTimeline.cpp (237230 => 237231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/DocumentTimeline.cpp      2018-10-17 19:00:03 UTC (rev 237230)
+++ trunk/Source/WebCore/animation/DocumentTimeline.cpp 2018-10-17 19:06:49 UTC (rev 237231)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx">     , m_animationResolutionTimer(*this, &DocumentTimeline::animationResolutionTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><ins>+    if (m_document && m_document->page() && !m_document->page()->isVisible())
+        suspendAnimations();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> DocumentTimeline::~DocumentTimeline() = default;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (237230 => 237231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp    2018-10-17 19:00:03 UTC (rev 237230)
+++ trunk/Source/WebCore/dom/Document.cpp       2018-10-17 19:06:49 UTC (rev 237231)
</span><span class="lines">@@ -2314,16 +2314,18 @@
</span><span class="cx">     // be out of sync if the DOM suspension state changed while the document was not in the frame (possibly in the
</span><span class="cx">     // page cache, or simply newly created).
</span><span class="cx">     if (m_frame->activeDOMObjectsAndAnimationsSuspended()) {
</span><del>-        if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-            timeline().suspendAnimations();
-        else
</del><ins>+        if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
+            if (auto* timeline = existingTimeline())
+                timeline->suspendAnimations();
+        } else
</ins><span class="cx">             m_frame->animation().suspendAnimationsForDocument(this);
</span><span class="cx">         suspendScheduledTasks(ReasonForSuspension::PageWillBeSuspended);
</span><span class="cx">     } else {
</span><span class="cx">         resumeScheduledTasks(ReasonForSuspension::PageWillBeSuspended);
</span><del>-        if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-            timeline().resumeAnimations();
-        else
</del><ins>+        if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
+            if (auto* timeline = existingTimeline())
+                timeline->resumeAnimations();
+        } else
</ins><span class="cx">             m_frame->animation().resumeAnimationsForDocument(this);
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -5089,9 +5091,10 @@
</span><span class="cx">     ASSERT(m_frame);
</span><span class="cx">     m_frame->loader().client().dispatchDidBecomeFrameset(isFrameSet());
</span><span class="cx"> 
</span><del>-    if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-        timeline().resumeAnimations();
-    else
</del><ins>+    if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
+        if (auto* timeline = existingTimeline())
+            timeline->resumeAnimations();  
+    } else
</ins><span class="cx">         m_frame->animation().resumeAnimationsForDocument(this);
</span><span class="cx"> 
</span><span class="cx">     resumeScheduledTasks(reason);
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (237230 => 237231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp      2018-10-17 19:00:03 UTC (rev 237230)
+++ trunk/Source/WebCore/page/Frame.cpp 2018-10-17 19:06:49 UTC (rev 237231)
</span><span class="lines">@@ -774,9 +774,10 @@
</span><span class="cx"> {
</span><span class="cx">     if (view) {
</span><span class="cx">         view->layoutContext().unscheduleLayout();
</span><del>-        if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-            document->timeline().suspendAnimations();
-        else
</del><ins>+        if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
+            if (auto* timeline = document->existingTimeline())
+                timeline->suspendAnimations();
+        } else
</ins><span class="cx">             view->frame().animation().suspendAnimationsForDocument(document);
</span><span class="cx">         view->frame().eventHandler().stopAutoscrollTimer();
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (237230 => 237231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp       2018-10-17 19:00:03 UTC (rev 237230)
+++ trunk/Source/WebCore/page/Page.cpp  2018-10-17 19:06:49 UTC (rev 237231)
</span><span class="lines">@@ -1735,7 +1735,8 @@
</span><span class="cx">         if (m_settings->hiddenPageCSSAnimationSuspensionEnabled()) {
</span><span class="cx">             if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
</span><span class="cx">                 forEachDocument([&] (Document& document) {
</span><del>-                    document.timeline().resumeAnimations();
</del><ins>+                    if (auto* timeline = document.existingTimeline())
+                        timeline->resumeAnimations();
</ins><span class="cx">                 });
</span><span class="cx">             } else
</span><span class="cx">                 mainFrame().animation().resumeAnimations();
</span><span class="lines">@@ -1755,7 +1756,8 @@
</span><span class="cx">         if (m_settings->hiddenPageCSSAnimationSuspensionEnabled()) {
</span><span class="cx">             if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
</span><span class="cx">                 forEachDocument([&] (Document& document) {
</span><del>-                    document.timeline().suspendAnimations();
</del><ins>+                    if (auto* timeline = document.existingTimeline())
+                        timeline->suspendAnimations();
</ins><span class="cx">                 });
</span><span class="cx">             } else
</span><span class="cx">                 mainFrame().animation().suspendAnimations();
</span><span class="lines">@@ -2113,10 +2115,12 @@
</span><span class="cx">     if (!isVisible()) {
</span><span class="cx">         if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
</span><span class="cx">             forEachDocument([&] (Document& document) {
</span><del>-                if (m_settings->hiddenPageCSSAnimationSuspensionEnabled())
-                    document.timeline().suspendAnimations();
-                else
-                    document.timeline().resumeAnimations();
</del><ins>+                if (auto* timeline = document.existingTimeline()) {
+                    if (m_settings->hiddenPageCSSAnimationSuspensionEnabled())
+                        timeline->suspendAnimations();
+                    else
+                        timeline->resumeAnimations();
+                }
</ins><span class="cx">             });
</span><span class="cx">         } else {
</span><span class="cx">             if (m_settings->hiddenPageCSSAnimationSuspensionEnabled())
</span></span></pre>
</div>
</div>

</body>
</html>