Changeset 148122 in webkit

Timestamp:

Apr 10, 2013 12:03:02 PM (11 years ago)

Author:

Simon Fraser

Message:

Minor code cleanup in AnimationBase::progress
​https://bugs.webkit.org/show_bug.cgi?id=114371

Reviewed by Dean Jackson.

Convert some "return; else if" to just "return; if".

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::progress):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/AnimationBase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Minor code cleanup in AnimationBase::progress
+        https://bugs.webkit.org/show_bug.cgi?id=114371
+
+        Reviewed by Dean Jackson.
+
+        Convert some "return; else if" to just "return; if".
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::progress):
+
 2013-04-10  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/page/animation/AnimationBase.cpp

@@ -523 +523 @@
     if (postActive() || !m_animation->duration())
         return 1.0;
+
     if (m_animation->iterationCount() > 0 && elapsedTime >= dur) {
         const int integralIterationCount = static_cast<int>(m_animation->iterationCount());
@@ -541 +542 @@
                                         ctf->y2(),
                                         fractionalTime, m_animation->duration());
-    } else if (tf->isStepsTimingFunction()) {
+    }
+    
+    if (tf->isStepsTimingFunction()) {
         const StepsTimingFunction* stf = static_cast<const StepsTimingFunction*>(tf);
         return solveStepsFunction(stf->numberOfSteps(), stf->stepAtStart(), fractionalTime);
-    } else
-        return fractionalTime;
+    }
+
+    return fractionalTime;
 }