Changeset 187461 in webkit

Timestamp:

Jul 27, 2015 4:25:01 PM (9 years ago)

Author:

Simon Fraser

Message:

Rename AnimationBase::isTransformFunctionListValid()
​https://bugs.webkit.org/show_bug.cgi?id=147334

Reviewed by Sam Weinig.

isTransformFunctionListValid() was a confusing name for this state. It's true
when the transform function lists for an animation or transition are matched,
so rename it to transformFunctionListsMatch().

No behavior change.

• page/animation/AnimationBase.h:

(WebCore::AnimationBase::transformFunctionListsMatch):
(WebCore::AnimationBase::isTransformFunctionListValid): Deleted.

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

• page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):
(WebCore::ImplicitAnimation::validateTransformFunctionList):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
(WebCore::KeyframeAnimation::validateTransformFunctionList):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/AnimationBase.h (modified) (2 diffs)
• page/animation/CSSPropertyAnimation.cpp (modified) (1 diff)
• page/animation/ImplicitAnimation.cpp (modified) (3 diffs)
• page/animation/KeyframeAnimation.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename AnimationBase::isTransformFunctionListValid()
+        https://bugs.webkit.org/show_bug.cgi?id=147334
+
+        Reviewed by Sam Weinig.
+        
+        isTransformFunctionListValid() was a confusing name for this state. It's true
+        when the transform function lists for an animation or transition are matched,
+        so rename it to transformFunctionListsMatch().
+
+        No behavior change.
+
+        * page/animation/AnimationBase.h:
+        (WebCore::AnimationBase::transformFunctionListsMatch):
+        (WebCore::AnimationBase::isTransformFunctionListValid): Deleted.
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::blendFunc):
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):
+        (WebCore::ImplicitAnimation::validateTransformFunctionList):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
+        (WebCore::KeyframeAnimation::validateTransformFunctionList):
+
 2015-07-27  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -186 +186 @@
     }
 
-    // FIXME: rename this using the "lists match" terminology.
-    bool isTransformFunctionListValid() const { return m_transformFunctionListValid; }
+    bool transformFunctionListsMatch() const { return m_transformFunctionListsMatch; }
     bool filterFunctionListsMatch() const { return m_filterFunctionListsMatch; }
 #if ENABLE(FILTERS_LEVEL_2)
@@ -257 +256 @@
     AnimationState m_animationState { AnimationState::New };
     bool m_isAccelerated { false };
-    bool m_transformFunctionListValid { false };
+    bool m_transformFunctionListsMatch { false };
     bool m_filterFunctionListsMatch { false };
 #if ENABLE(FILTERS_LEVEL_2)

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

@@ -117 +117 @@
 static inline TransformOperations blendFunc(const AnimationBase* animation, const TransformOperations& from, const TransformOperations& to, double progress)
 {
-    if (animation->isTransformFunctionListValid())
+    if (animation->transformFunctionListsMatch())
         return to.blendByMatchingOperations(from, progress);
     return to.blendByUsingMatrixInterpolation(from, progress, is<RenderBox>(*animation->renderer()) ? downcast<RenderBox>(*animation->renderer()).borderBoxRect().size() : LayoutSize());

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

@@ -119 +119 @@
     LayoutRect endBounds = bounds;
 
-    if (isTransformFunctionListValid()) {
+    if (transformFunctionListsMatch()) {
         if (!computeTransformedExtentViaTransformList(rendererBox, *m_fromStyle, startBounds))
             return false;
@@ -261 +261 @@
 void ImplicitAnimation::validateTransformFunctionList()
 {
-    m_transformFunctionListValid = false;
+    m_transformFunctionListsMatch = false;
     
     if (!m_fromStyle || !m_toStyle)
@@ -280 +280 @@
 
     // Transform lists match.
-    m_transformFunctionListValid = true;
+    m_transformFunctionListsMatch = true;
 }
 

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

@@ -231 +231 @@
         
         bool canCompute;
-        if (isTransformFunctionListValid())
+        if (transformFunctionListsMatch())
             canCompute = computeTransformedExtentViaTransformList(rendererBox, *keyframe.style(), keyframeBounds);
         else
@@ -365 +365 @@
 void KeyframeAnimation::validateTransformFunctionList()
 {
-    m_transformFunctionListValid = false;
+    m_transformFunctionListsMatch = false;
     
     if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyTransform))
@@ -400 +400 @@
     }
 
-    // Keyframes are valid
-    m_transformFunctionListValid = true;
+    m_transformFunctionListsMatch = true;
 }