Changeset 268873 in webkit

Timestamp:

Oct 22, 2020, 11:26:27 AM (6 years ago)

Author:

Alan Coon

Message:

Revert r268771. rdar://problem/70578639

Location:

branches/safari-611.1.4-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/webanimations/accelerated-overlapping-transform-animations-expected.html (deleted)
• LayoutTests/webanimations/accelerated-overlapping-transform-animations.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)

branches/safari-611.1.4-branch/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-22  Alan Coon  <alancoon@apple.com>
+
+        Revert r268771. rdar://problem/70578639
+
 2020-10-21  Alan Coon  <alancoon@apple.com>
 

branches/safari-611.1.4-branch/LayoutTests/platform/mac-wk1/TestExpectations

@@ -1194 +1194 @@
 
 webkit.org/b/217761 [ Mojave+ Debug ] webgl/2.0.0/conformance/extensions/webgl-compressed-texture-s3tc-srgb.html [ Pass Crash ]
-
-webkit.org/b/217997 webanimations/accelerated-overlapping-transform-animations.html [ Pass Failure ]

branches/safari-611.1.4-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-22  Alan Coon  <alancoon@apple.com>
+
+        Revert r268771. rdar://problem/70578639
+
 2020-10-21  Alan Coon  <alancoon@apple.com>
 

branches/safari-611.1.4-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1080 +1080 @@
     LOG_WITH_STREAM(Animations, stream << "GraphicsLayerCA " << this << " id " << primaryLayerID() << " pauseAnimation " << animationName << " (is running " << animationIsRunning(animationName) << ")");
 
-    for (auto& animation : m_animations) {
-        // There may be several animations with the same name in the case of transform animations
-        // animating multiple components as individual animations.
-        if (animation.m_name == animationName && !animation.m_pendingRemoval) {
-            animation.m_playState = PlayState::PausePending;
-            animation.m_timeOffset = Seconds { timeOffset };
-
-            noteLayerPropertyChanged(AnimationChanged);
-        }
-    }
+    auto index = m_animations.findMatching([&](LayerPropertyAnimation animation) {
+        return animation.m_name == animationName && !animation.m_pendingRemoval;
+    });
+
+    if (index == notFound)
+        return;
+
+    auto& animation = m_animations[index];
+    animation.m_playState = PlayState::PausePending;
+    animation.m_timeOffset = Seconds { timeOffset };
+
+    noteLayerPropertyChanged(AnimationChanged);
 }
 
@@ -1096 +1098 @@
     LOG_WITH_STREAM(Animations, stream << "GraphicsLayerCA " << this << " id " << primaryLayerID() << " removeAnimation " << animationName << " (is running " << animationIsRunning(animationName) << ")");
 
-    for (auto& animation : m_animations) {
-        // There may be several animations with the same name in the case of transform animations
-        // animating multiple components as individual animations.
-        if (animation.m_name == animationName && !animation.m_pendingRemoval) {
-            animation.m_pendingRemoval = true;
-            noteLayerPropertyChanged(AnimationChanged | CoverageRectChanged);
-        }
-    }
+    auto index = m_animations.findMatching([&](LayerPropertyAnimation animation) {
+        return animation.m_name == animationName && !animation.m_pendingRemoval;
+    });
+
+    if (index == notFound)
+        return;
+
+    m_animations[index].m_pendingRemoval = true;
+
+    noteLayerPropertyChanged(AnimationChanged | CoverageRectChanged);
 }
 
@@ -2957 +2961 @@
             break;
         case AnimatedPropertyTransform:
-            // In the case of animations targeting the "transform" CSS property, there may be several
-            // animations created for a single KeyframeEffect, one for each transform component. In that
-            // case the animation index starts at 0 and increases for each component. If we encounter an
-            // index of 0 this means this animation establishes a new group of animation belonging to a
-            // single KeyframeEffect. As such, since the top-most KeyframeEffect replaces the previous
-            // ones, we can remove all the previously-added "transform" animations.
-            if (!animation.m_index)
-                transformAnimations.clear();
             transformAnimations.append(&animation);
             break;