<!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>[184148] 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/184148">184148</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-05-11 19:39:37 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Small tidyup in animations code
https://bugs.webkit.org/show_bug.cgi?id=144893
Reviewed by Eric Carlson.
Reading progress(1, 0, 0) in callers of AnimationBase::progress() was confusing,
particularly as the last parameter is a TimingFunction*. Put default values
in the header (with nullptr) and fix the callers. Also fix variable names in
the implementation.
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::progress):
* page/animation/AnimationBase.h:
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::animate):
(WebCore::ImplicitAnimation::getAnimatedStyle):
(WebCore::ImplicitAnimation::blendPropertyValueInStyle):</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="#trunkSourceWebCorepageanimationAnimationBaseh">trunk/Source/WebCore/page/animation/AnimationBase.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationcpp">trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184147 => 184148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-12 02:06:54 UTC (rev 184147)
+++ trunk/Source/WebCore/ChangeLog 2015-05-12 02:39:37 UTC (rev 184148)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-11 Simon Fraser <simon.fraser@apple.com>
+
+ Small tidyup in animations code
+ https://bugs.webkit.org/show_bug.cgi?id=144893
+
+ Reviewed by Eric Carlson.
+
+ Reading progress(1, 0, 0) in callers of AnimationBase::progress() was confusing,
+ particularly as the last parameter is a TimingFunction*. Put default values
+ in the header (with nullptr) and fix the callers. Also fix variable names in
+ the implementation.
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::progress):
+ * page/animation/AnimationBase.h:
+ * page/animation/ImplicitAnimation.cpp:
+ (WebCore::ImplicitAnimation::animate):
+ (WebCore::ImplicitAnimation::getAnimatedStyle):
+ (WebCore::ImplicitAnimation::blendPropertyValueInStyle):
+
</ins><span class="cx"> 2015-05-11 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr in WebCore/rendering
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (184147 => 184148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-05-12 02:06:54 UTC (rev 184147)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-05-12 02:39:37 UTC (rev 184148)
</span><span class="lines">@@ -613,21 +613,21 @@
</span><span class="cx"> return fractionalTime;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double AnimationBase::progress(double scale, double offset, const TimingFunction* tf) const
</del><ins>+double AnimationBase::progress(double scale, double offset, const TimingFunction* timingFunction) const
</ins><span class="cx"> {
</span><span class="cx"> if (preActive())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> double elapsedTime = getElapsedTime();
</span><span class="cx">
</span><del>- double dur = m_animation->duration();
</del><ins>+ double duration = m_animation->duration();
</ins><span class="cx"> if (m_animation->iterationCount() > 0)
</span><del>- dur *= m_animation->iterationCount();
</del><ins>+ duration *= m_animation->iterationCount();
</ins><span class="cx">
</span><span class="cx"> if (postActive() || !m_animation->duration())
</span><span class="cx"> return 1.0;
</span><span class="cx">
</span><del>- if (m_animation->iterationCount() > 0 && elapsedTime >= dur) {
</del><ins>+ if (m_animation->iterationCount() > 0 && elapsedTime >= duration) {
</ins><span class="cx"> const int integralIterationCount = static_cast<int>(m_animation->iterationCount());
</span><span class="cx"> const bool iterationCountHasFractional = m_animation->iterationCount() - integralIterationCount;
</span><span class="cx"> return (integralIterationCount % 2 || iterationCountHasFractional) ? 1.0 : 0.0;
</span><span class="lines">@@ -635,16 +635,16 @@
</span><span class="cx">
</span><span class="cx"> const double fractionalTime = this->fractionalTime(scale, elapsedTime, offset);
</span><span class="cx">
</span><del>- if (!tf)
- tf = m_animation->timingFunction().get();
</del><ins>+ if (!timingFunction)
+ timingFunction = m_animation->timingFunction().get();
</ins><span class="cx">
</span><del>- switch (tf->type()) {
</del><ins>+ switch (timingFunction->type()) {
</ins><span class="cx"> case TimingFunction::CubicBezierFunction: {
</span><del>- const CubicBezierTimingFunction* function = static_cast<const CubicBezierTimingFunction*>(tf);
</del><ins>+ const CubicBezierTimingFunction* function = static_cast<const CubicBezierTimingFunction*>(timingFunction);
</ins><span class="cx"> return solveCubicBezierFunction(function->x1(), function->y1(), function->x2(), function->y2(), fractionalTime, m_animation->duration());
</span><span class="cx"> }
</span><span class="cx"> case TimingFunction::StepsFunction: {
</span><del>- const StepsTimingFunction* stepsTimingFunction = static_cast<const StepsTimingFunction*>(tf);
</del><ins>+ const StepsTimingFunction* stepsTimingFunction = static_cast<const StepsTimingFunction*>(timingFunction);
</ins><span class="cx"> return solveStepsFunction(stepsTimingFunction->numberOfSteps(), stepsTimingFunction->stepAtStart(), fractionalTime);
</span><span class="cx"> }
</span><span class="cx"> case TimingFunction::LinearFunction:
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.h (184147 => 184148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.h 2015-05-12 02:06:54 UTC (rev 184147)
+++ trunk/Source/WebCore/page/animation/AnimationBase.h 2015-05-12 02:39:37 UTC (rev 184148)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> virtual double timeToNextService();
</span><span class="cx">
</span><del>- double progress(double scale, double offset, const TimingFunction*) const;
</del><ins>+ double progress(double scale = 1, double offset = 0, const TimingFunction* = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> // Returns true if the animation state changed.
</span><span class="cx"> virtual bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* /*currentStyle*/, RenderStyle* /*targetStyle*/, RefPtr<RenderStyle>& /*animatedStyle*/) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (184147 => 184148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2015-05-12 02:06:54 UTC (rev 184147)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2015-05-12 02:39:37 UTC (rev 184148)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if (!animatedStyle)
</span><span class="cx"> animatedStyle = RenderStyle::clone(targetStyle);
</span><span class="cx">
</span><del>- bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
</del><ins>+ bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress());
</ins><span class="cx"> // FIXME: we also need to detect cases where we have to software animate for other reasons,
</span><span class="cx"> // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902
</span><span class="cx"> if (!needsAnim) {
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (!animatedStyle)
</span><span class="cx"> animatedStyle = RenderStyle::clone(m_toStyle.get());
</span><span class="cx">
</span><del>- CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
</del><ins>+ CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ImplicitAnimation::computeExtentOfTransformAnimation(LayoutRect& bounds) const
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> if (!m_toStyle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CSSPropertyAnimation::blendProperties(this, prop, currentStyle, m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
</del><ins>+ CSSPropertyAnimation::blendProperties(this, prop, currentStyle, m_fromStyle.get(), m_toStyle.get(), progress());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImplicitAnimation::validateTransformFunctionList()
</span></span></pre>
</div>
</div>
</body>
</html>