<!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>[183295] 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/183295">183295</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-04-24 17:11:07 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AnimationController::scrollWasUpdated() shows up in scrolling profiles on pages that don't use scroll triggers
https://bugs.webkit.org/show_bug.cgi?id=144173
<rdar://problem/20526168>
Reviewed by Simon Fraser.
Keep a list of Animations that care about scroll updates, and only
run the animation update if the list is not empty.
Covered by existing tests.
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::updateStateMachine): Tell the AnimationController
if this is an animation that depends on scrolling.
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::animationWillBeRemoved): Call the
new removeFromAnimationsDependentOnScroll as this animation is deleted.
(WebCore::AnimationControllerPrivate::addToAnimationsDependentOnScroll):
(WebCore::AnimationControllerPrivate::removeFromAnimationsDependentOnScroll):
(WebCore::AnimationControllerPrivate::scrollWasUpdated): Only update if
there are animations that care.
(WebCore::AnimationController::wantsScrollUpdates): Helper to expose this
value to FrameView.
* page/animation/AnimationController.h:
* page/animation/AnimationControllerPrivate.h:
(WebCore::AnimationControllerPrivate::wantsScrollUpdates):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorepageanimationAnimationControllercpp">trunk/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllerh">trunk/Source/WebCore/page/animation/AnimationController.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllerPrivateh">trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183294 => 183295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-25 00:09:25 UTC (rev 183294)
+++ trunk/Source/WebCore/ChangeLog 2015-04-25 00:11:07 UTC (rev 183295)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-04-24 Dean Jackson <dino@apple.com>
+
+ AnimationController::scrollWasUpdated() shows up in scrolling profiles on pages that don't use scroll triggers
+ https://bugs.webkit.org/show_bug.cgi?id=144173
+ <rdar://problem/20526168>
+
+ Reviewed by Simon Fraser.
+
+ Keep a list of Animations that care about scroll updates, and only
+ run the animation update if the list is not empty.
+
+ Covered by existing tests.
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::updateStateMachine): Tell the AnimationController
+ if this is an animation that depends on scrolling.
+ * page/animation/AnimationController.cpp:
+ (WebCore::AnimationControllerPrivate::animationWillBeRemoved): Call the
+ new removeFromAnimationsDependentOnScroll as this animation is deleted.
+ (WebCore::AnimationControllerPrivate::addToAnimationsDependentOnScroll):
+ (WebCore::AnimationControllerPrivate::removeFromAnimationsDependentOnScroll):
+ (WebCore::AnimationControllerPrivate::scrollWasUpdated): Only update if
+ there are animations that care.
+ (WebCore::AnimationController::wantsScrollUpdates): Helper to expose this
+ value to FrameView.
+ * page/animation/AnimationController.h:
+ * page/animation/AnimationControllerPrivate.h:
+ (WebCore::AnimationControllerPrivate::wantsScrollUpdates):
+
</ins><span class="cx"> 2015-04-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKPDFView does not support password-protected PDFs
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (183294 => 183295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-04-25 00:09:25 UTC (rev 183294)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-04-25 00:11:07 UTC (rev 183295)
</span><span class="lines">@@ -229,6 +229,11 @@
</span><span class="cx"> LOG(Animations, "%p AnimationState %s -> AnimationState::PausedNew", this, nameForState(m_animationState));
</span><span class="cx"> m_animationState = AnimationState::PausedNew;
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
+ if (m_animation->trigger() && m_animation->trigger()->isScrollAnimationTrigger())
+ m_compositeAnimation->animationController()->addToAnimationsDependentOnScroll(this);
+#endif
</ins><span class="cx"> break;
</span><span class="cx"> case AnimationState::StartWaitTimer:
</span><span class="cx"> ASSERT(input == AnimationStateInput::StartTimerFired || input == AnimationStateInput::PlayStatePaused);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (183294 => 183295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.cpp 2015-04-25 00:09:25 UTC (rev 183294)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp 2015-04-25 00:11:07 UTC (rev 183295)
</span><span class="lines">@@ -514,15 +514,33 @@
</span><span class="cx"> {
</span><span class="cx"> removeFromAnimationsWaitingForStyle(animation);
</span><span class="cx"> removeFromAnimationsWaitingForStartTimeResponse(animation);
</span><ins>+#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
+ removeFromAnimationsDependentOnScroll(animation);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><ins>+void AnimationControllerPrivate::addToAnimationsDependentOnScroll(AnimationBase* animation)
+{
+ m_animationsDependentOnScroll.add(animation);
+}
+
+void AnimationControllerPrivate::removeFromAnimationsDependentOnScroll(AnimationBase* animation)
+{
+ m_animationsDependentOnScroll.remove(animation);
+}
+
</ins><span class="cx"> void AnimationControllerPrivate::scrollWasUpdated()
</span><span class="cx"> {
</span><span class="cx"> auto* view = m_frame.view();
</span><del>- if (!view)
</del><ins>+ if (!view || !wantsScrollUpdates())
</ins><span class="cx"> return;
</span><span class="cx"> m_scrollPosition = view->scrollOffsetForFixedPosition().height().toFloat();
</span><ins>+
+ // FIXME: This is updating all the animations, rather than just the ones
+ // that are dependent on scroll. We to go from our AnimationBase to its CompositeAnimation
+ // so we can execute code similar to updateAnimations.
+ // https://bugs.webkit.org/show_bug.cgi?id=144170
</ins><span class="cx"> updateAnimations(CallSetChanged);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -714,6 +732,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><ins>+bool AnimationController::wantsScrollUpdates() const
+{
+ return m_data->wantsScrollUpdates();
+}
+
</ins><span class="cx"> void AnimationController::scrollWasUpdated()
</span><span class="cx"> {
</span><span class="cx"> m_data->scrollWasUpdated();
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.h (183294 => 183295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.h 2015-04-25 00:09:25 UTC (rev 183294)
+++ trunk/Source/WebCore/page/animation/AnimationController.h 2015-04-25 00:11:07 UTC (rev 183295)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> static bool supportsAcceleratedAnimationOfProperty(CSSPropertyID);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><ins>+ bool wantsScrollUpdates() const;
</ins><span class="cx"> void scrollWasUpdated();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h (183294 => 183295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h 2015-04-25 00:09:25 UTC (rev 183294)
+++ trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h 2015-04-25 00:11:07 UTC (rev 183295)
</span><span class="lines">@@ -118,6 +118,10 @@
</span><span class="cx"> void setAllowsNewAnimationsWhileSuspended(bool);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><ins>+ bool wantsScrollUpdates() const { return !m_animationsDependentOnScroll.isEmpty(); }
+ void addToAnimationsDependentOnScroll(AnimationBase*);
+ void removeFromAnimationsDependentOnScroll(AnimationBase*);
+
</ins><span class="cx"> void scrollWasUpdated();
</span><span class="cx"> float scrollPosition() const { return m_scrollPosition; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -147,9 +151,9 @@
</span><span class="cx">
</span><span class="cx"> double m_beginAnimationUpdateTime;
</span><span class="cx">
</span><del>- typedef HashSet<RefPtr<AnimationBase>> WaitingAnimationsSet;
- WaitingAnimationsSet m_animationsWaitingForStyle;
- WaitingAnimationsSet m_animationsWaitingForStartTimeResponse;
</del><ins>+ typedef HashSet<RefPtr<AnimationBase>> AnimationsSet;
+ AnimationsSet m_animationsWaitingForStyle;
+ AnimationsSet m_animationsWaitingForStartTimeResponse;
</ins><span class="cx">
</span><span class="cx"> int m_beginAnimationUpdateCount;
</span><span class="cx">
</span><span class="lines">@@ -162,7 +166,8 @@
</span><span class="cx"> bool m_allowsNewAnimationsWhileSuspended;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><del>- float m_scrollPosition = 0;
</del><ins>+ AnimationsSet m_animationsDependentOnScroll;
+ float m_scrollPosition { 0 };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>