<!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>[204784] releases/WebKitGTK/webkit-2.12/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/204784">204784</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-23 01:43:00 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200171">r200171</a> - SVG SMIL animations run at less than 60fps
https://bugs.webkit.org/show_bug.cgi?id=157119
rdar://problem/25971304
Reviewed by Tim Horton.
If you re-fetch current time while doing animation computations you're gonna have
a bad time.
More specifically, SMILTimeContainer::startTimer() re-fetched elapsedTime() when
computing the delay for the next timer fire, then clamped to 16.667ms, so the timer
would actually be scheduled at intervals greater than desired, causing a ~54fps framerate.
Fix by using the elapsedTime fetched at the start of animation processing.
Tested by iOS content-animation performance tests.
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::SVGSVGElement): Just cleanup.
* svg/animation/SMILTimeContainer.cpp:
(WebCore::SMILTimeContainer::notifyIntervalsChanged):
(WebCore::SMILTimeContainer::resume):
(WebCore::SMILTimeContainer::startTimer):
(WebCore::SMILTimeContainer::updateAnimations):
* svg/animation/SMILTimeContainer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoresvgSVGSVGElementcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGSVGElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoresvganimationSMILTimeContainercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoresvganimationSMILTimeContainerh">releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204783 => 204784)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 08:42:49 UTC (rev 204783)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 08:43:00 UTC (rev 204784)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-04-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ SVG SMIL animations run at less than 60fps
+ https://bugs.webkit.org/show_bug.cgi?id=157119
+ rdar://problem/25971304
+
+ Reviewed by Tim Horton.
+
+ If you re-fetch current time while doing animation computations you're gonna have
+ a bad time.
+
+ More specifically, SMILTimeContainer::startTimer() re-fetched elapsedTime() when
+ computing the delay for the next timer fire, then clamped to 16.667ms, so the timer
+ would actually be scheduled at intervals greater than desired, causing a ~54fps framerate.
+
+ Fix by using the elapsedTime fetched at the start of animation processing.
+
+ Tested by iOS content-animation performance tests.
+
+ * svg/SVGSVGElement.cpp:
+ (WebCore::SVGSVGElement::SVGSVGElement): Just cleanup.
+ * svg/animation/SMILTimeContainer.cpp:
+ (WebCore::SMILTimeContainer::notifyIntervalsChanged):
+ (WebCore::SMILTimeContainer::resume):
+ (WebCore::SMILTimeContainer::startTimer):
+ (WebCore::SMILTimeContainer::updateAnimations):
+ * svg/animation/SMILTimeContainer.h:
+
+2016-04-27 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> CSS and SVG animations should run at 60fps
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157113
</span><span class="cx"> rdar://problem/24337280
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoresvgSVGSVGElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGSVGElement.cpp (204783 => 204784)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGSVGElement.cpp 2016-08-23 08:42:49 UTC (rev 204783)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGSVGElement.cpp 2016-08-23 08:43:00 UTC (rev 204784)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> , m_y(LengthModeHeight)
</span><span class="cx"> , m_width(LengthModeWidth, ASCIILiteral("100%"))
</span><span class="cx"> , m_height(LengthModeHeight, ASCIILiteral("100%"))
</span><del>- , m_timeContainer(RefPtr<SMILTimeContainer>(SMILTimeContainer::create(this)).releaseNonNull())
</del><ins>+ , m_timeContainer(SMILTimeContainer::create(this))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(SVGNames::svgTag));
</span><span class="cx"> registerAnimatedPropertiesForSVGSVGElement();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoresvganimationSMILTimeContainercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.cpp (204783 => 204784)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.cpp 2016-08-23 08:42:49 UTC (rev 204783)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.cpp 2016-08-23 08:43:00 UTC (rev 204784)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Schedule updateAnimations() to be called asynchronously so multiple intervals
</span><span class="cx"> // can change with updateAnimations() only called once at the end.
</span><del>- startTimer(0);
</del><ins>+ startTimer(elapsed(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SMILTime SMILTimeContainer::elapsed() const
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> m_resumeTime = monotonicallyIncreasingTime();
</span><span class="cx"> m_pauseTime = 0;
</span><del>- startTimer(0);
</del><ins>+ startTimer(elapsed(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SMILTimeContainer::setElapsed(SMILTime time)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> updateAnimations(time, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SMILTimeContainer::startTimer(SMILTime fireTime, SMILTime minimumDelay)
</del><ins>+void SMILTimeContainer::startTimer(SMILTime elapsed, SMILTime fireTime, SMILTime minimumDelay)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_beginTime || isPaused())
</span><span class="cx"> return;
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> if (!fireTime.isFinite())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- SMILTime delay = std::max(fireTime - elapsed(), minimumDelay);
</del><ins>+ SMILTime delay = std::max(fireTime - elapsed, minimumDelay);
</ins><span class="cx"> m_timer.startOneShot(delay.value());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_preventScheduledAnimationsChanges = false;
</span><span class="cx"> #endif
</span><del>- startTimer(earliestFireTime, SMILAnimationFrameDelay);
</del><ins>+ startTimer(elapsed, earliestFireTime, SMILAnimationFrameDelay);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> m_preventScheduledAnimationsChanges = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- startTimer(earliestFireTime, SMILAnimationFrameDelay);
</del><ins>+ startTimer(elapsed, earliestFireTime, SMILAnimationFrameDelay);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoresvganimationSMILTimeContainerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.h (204783 => 204784)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.h 2016-08-23 08:42:49 UTC (rev 204783)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/animation/SMILTimeContainer.h 2016-08-23 08:43:00 UTC (rev 204784)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> SMILTimeContainer(SVGSVGElement* owner);
</span><span class="cx">
</span><span class="cx"> void timerFired();
</span><del>- void startTimer(SMILTime fireTime, SMILTime minimumDelay = 0);
</del><ins>+ void startTimer(SMILTime elapsed, SMILTime fireTime, SMILTime minimumDelay = 0);
</ins><span class="cx"> void updateAnimations(SMILTime elapsed, bool seekToTime = false);
</span><span class="cx">
</span><span class="cx"> void updateDocumentOrderIndexes();
</span></span></pre>
</div>
</div>
</body>
</html>