Changeset 263481 in webkit

Timestamp:

Jun 24, 2020 4:04:43 PM (4 years ago)

Author:

Jason_Lawrence

Message:

Unreviewed, reverting r263466.

This commit caused 50+ crashes on multiple queues internally.

Reverted changeset:

"REGRESSION (r260360): easing curves are broken on JS-
originated animations"
​https://bugs.webkit.org/show_bug.cgi?id=213495
​https://trac.webkit.org/changeset/263466

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/accelerated-animation-with-easing-expected.html (deleted)
• LayoutTests/webanimations/accelerated-animation-with-easing.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (10 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-06-24  Jason Lawrence  <lawrence.j@apple.com>
+
+        Unreviewed, reverting r263466.
+
+        This commit caused 50+ crashes on multiple queues internally.
+
+        Reverted changeset:
+
+        "REGRESSION (r260360): easing curves are broken on JS-
+        originated animations"
+        https://bugs.webkit.org/show_bug.cgi?id=213495
+        https://trac.webkit.org/changeset/263466
+
 2020-06-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-24  Jason Lawrence  <lawrence.j@apple.com>
+
+        Unreviewed, reverting r263466.
+
+        This commit caused 50+ crashes on multiple queues internally.
+
+        Reverted changeset:
+
+        "REGRESSION (r260360): easing curves are broken on JS-
+        originated animations"
+        https://bugs.webkit.org/show_bug.cgi?id=213495
+        https://trac.webkit.org/changeset/263466
+
 2020-06-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -42 +42 @@
 #include "Region.h"
 #include "RotateTransformOperation.h"
-#include "RuntimeEnabledFeatures.h"
 #include "ScaleTransformOperation.h"
 #include "TiledBacking.h"
@@ -3075 +3074 @@
 }
 
-static bool isKeyframe(const KeyframeValueList& list)
-{
-    if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-        return list.size() > 1;
-    return list.size() > 2;
-}
-
 bool GraphicsLayerCA::createAnimationFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, Seconds timeOffset)
 {
     ASSERT(valueList.property() != AnimatedPropertyTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyFilter));
 
+    bool isKeyframe = valueList.size() > 2;
     bool valuesOK;
     
@@ -3093 +3086 @@
     RefPtr<PlatformCAAnimation> caAnimation;
 
-    if (isKeyframe(valueList)) {
+    if (isKeyframe) {
         caAnimation = createKeyframeAnimation(animation, propertyIdToString(valueList.property()), additive);
         valuesOK = setAnimationKeyframes(valueList, animation, caAnimation.get());
@@ -3121 +3114 @@
     bool additive = animationIndex < numAnimations - 1;
 #endif
+    bool isKeyframe = valueList.size() > 2;
 
     RefPtr<PlatformCAAnimation> caAnimation;
     bool validMatrices = true;
-    if (isKeyframe(valueList)) {
+    if (isKeyframe) {
         caAnimation = createKeyframeAnimation(animation, propertyIdToString(valueList.property()), additive);
         validMatrices = setTransformAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize);
@@ -3173 +3167 @@
 bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& valueList, const FilterOperation* operation, const Animation* animation, const String& animationName, int animationIndex, Seconds timeOffset)
 {
+    bool isKeyframe = valueList.size() > 2;
+    
     FilterOperation::OperationType filterOp = operation->type();
     int numAnimatedProperties = PlatformCAFilters::numAnimatedFilterProperties(filterOp);
@@ -3188 +3184 @@
         String keyPath = makeString("filters.filter_", animationIndex, '.', PlatformCAFilters::animatedFilterPropertyName(filterOp, internalFilterPropertyIndex));
         
-        if (isKeyframe(valueList)) {
+        if (isKeyframe) {
             caAnimation = createKeyframeAnimation(animation, keyPath, false);
             valuesOK = setFilterAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, internalFilterPropertyIndex, filterOp);
@@ -3329 +3325 @@
     propertyAnim->setAdditive(additive);
     propertyAnim->setFillMode(fillMode);
-
-    if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-        propertyAnim->setTimingFunction(anim->timingFunction());
 }
 
 const TimingFunction& GraphicsLayerCA::timingFunctionForAnimationValue(const AnimationValue& animValue, const Animation& anim)
 {
-    if (RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled()) {
-        if (animValue.timingFunction())
-            return *animValue.timingFunction();
-        return LinearTimingFunction::create();
-    }
-
     if (animValue.timingFunction())
         return *animValue.timingFunction();
@@ -3369 +3356 @@
     // This codepath is used for 2-keyframe animations, so we still need to look in the start
     // for a timing function. Even in the reversing animation case, the first keyframe provides the timing function.
-    if (!RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-        basicAnim->setTimingFunction(&timingFunctionForAnimationValue(valueList.at(0), *animation), !forwards);
+    basicAnim->setTimingFunction(&timingFunctionForAnimationValue(valueList.at(0), *animation), !forwards);
 
     return true;
@@ -3463 +3449 @@
     // This codepath is used for 2-keyframe animations, so we still need to look in the start
     // for a timing function. Even in the reversing animation case, the first keyframe provides the timing function.
-    if (!RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-        basicAnim->setTimingFunction(&timingFunctionForAnimationValue(valueList.at(0), *animation), !forwards);
+    basicAnim->setTimingFunction(&timingFunctionForAnimationValue(valueList.at(0), *animation), !forwards);
 
     auto valueFunction = getValueFunctionNameForTransformOperation(transformOpType);
@@ -3574 +3559 @@
     // This codepath is used for 2-keyframe animations, so we still need to look in the start
     // for a timing function. Even in the reversing animation case, the first keyframe provides the timing function.
-    if (!RuntimeEnabledFeatures::sharedFeatures().webAnimationsCSSIntegrationEnabled())
-        basicAnim->setTimingFunction(&timingFunctionForAnimationValue(valueList.at(0), *animation), !forwards);
+    basicAnim->setTimingFunction(&timingFunctionForAnimationValue(valueList.at(0), *animation), !forwards);
 
     return true;