Title: [275296] trunk/Source
Revision
275296
Author
grao...@webkit.org
Date
2021-03-31 11:29:23 -0700 (Wed, 31 Mar 2021)

Log Message

Remove CA_WHERE_ADDITIVE_TRANSFORMS_ARE_REVERSED
https://bugs.webkit.org/show_bug.cgi?id=224000

Reviewed by Simon Fraser.

Since trunk is no longer maintained on macOS versions earlier than 10.15,
we can remove this compile-time flag.

Source/WebCore:

* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateAnimations):

Source/WTF:

* wtf/PlatformHave.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (275295 => 275296)


--- trunk/Source/WTF/ChangeLog	2021-03-31 18:14:23 UTC (rev 275295)
+++ trunk/Source/WTF/ChangeLog	2021-03-31 18:29:23 UTC (rev 275296)
@@ -1,3 +1,15 @@
+2021-03-31  Antoine Quint  <grao...@webkit.org>
+
+        Remove CA_WHERE_ADDITIVE_TRANSFORMS_ARE_REVERSED
+        https://bugs.webkit.org/show_bug.cgi?id=224000
+
+        Reviewed by Simon Fraser.
+
+        Since trunk is no longer maintained on macOS versions earlier than 10.15,
+        we can remove this compile-time flag.
+
+        * wtf/PlatformHave.h:
+
 2021-03-30  Chris Dumez  <cdu...@apple.com>
 
         Service Worker scripts use too much memory in the network process

Modified: trunk/Source/WTF/wtf/PlatformHave.h (275295 => 275296)


--- trunk/Source/WTF/wtf/PlatformHave.h	2021-03-31 18:14:23 UTC (rev 275295)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2021-03-31 18:29:23 UTC (rev 275296)
@@ -372,10 +372,6 @@
 #define HAVE_CG_FONT_RENDERING_GET_FONT_SMOOTHING_DISABLED 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY)
-#define HAVE_CA_WHERE_ADDITIVE_TRANSFORMS_ARE_REVERSED 1
-#endif
-
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
 #define HAVE_READ_ONLY_SYSTEM_VOLUME 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (275295 => 275296)


--- trunk/Source/WebCore/ChangeLog	2021-03-31 18:14:23 UTC (rev 275295)
+++ trunk/Source/WebCore/ChangeLog	2021-03-31 18:29:23 UTC (rev 275296)
@@ -1,3 +1,16 @@
+2021-03-31  Antoine Quint  <grao...@webkit.org>
+
+        Remove CA_WHERE_ADDITIVE_TRANSFORMS_ARE_REVERSED
+        https://bugs.webkit.org/show_bug.cgi?id=224000
+
+        Reviewed by Simon Fraser.
+
+        Since trunk is no longer maintained on macOS versions earlier than 10.15,
+        we can remove this compile-time flag.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateAnimations):
+
 2021-03-31  Patrick Angle  <pan...@apple.com>
 
         Web Inspector: CSS Grid overlay track sizes are incorrect when inline styles are applied to the element

Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (275295 => 275296)


--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2021-03-31 18:14:23 UTC (rev 275295)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	2021-03-31 18:29:23 UTC (rev 275296)
@@ -3095,8 +3095,6 @@
         // sound base to add animations on top of with additivity enabled.
         addBaseValueTransformAnimation(AnimatedPropertyTransform, TransformationMatrixSource::UseIdentityMatrix);
 
-        // Core Animation might require additive animations to be applied in the reverse order.
-#if !PLATFORM(WIN) && !HAVE(CA_WHERE_ADDITIVE_TRANSFORMS_ARE_REVERSED)
         auto addAnimationsForProperty = [&](const Vector<LayerPropertyAnimation*>& animations, AnimatedPropertyID property) {
             if (animations.isEmpty()) {
                 addBaseValueTransformAnimation(property);
@@ -3104,52 +3102,7 @@
             }
 
             LayerPropertyAnimation* earliestAnimation = nullptr;
-            for (auto* animation : animations) {
-                if (auto beginTime = animation->computedBeginTime()) {
-                    if (!earliestAnimation || *earliestAnimation->computedBeginTime() > *beginTime)
-                        earliestAnimation = animation;
-                }
-            }
-
             Vector<RefPtr<PlatformCAAnimation>> caAnimations;
-
-            // If we have an animation with an explicit begin time that does not fill backwards and starts with a delay,
-            // we must create a non-interpolating animation to set the current value for this transform-related property
-            // until that animation begins.
-            if (earliestAnimation) {
-                auto fillMode = earliestAnimation->m_animation->fillMode();
-                if (fillMode != PlatformCAAnimation::Backwards && fillMode != PlatformCAAnimation::Both) {
-                    Seconds earliestBeginTime = *earliestAnimation->computedBeginTime() + animationGroupBeginTime;
-                    if (earliestBeginTime > currentTime) {
-                        if (auto* baseValueTransformAnimation = makeBaseValueTransformAnimation(property, TransformationMatrixSource::AskClient, earliestBeginTime)) {
-                            prepareAnimationForAddition(*baseValueTransformAnimation);
-                            caAnimations.append(baseValueTransformAnimation->m_animation);
-                        }
-                    }
-                }
-            }
-
-            for (auto* animation : animations) {
-                prepareAnimationForAddition(*animation);
-                caAnimations.append(animation->m_animation);
-            }
-
-            addAnimationGroup(property, caAnimations);
-        };
-
-        addAnimationsForProperty(translateAnimations, AnimatedPropertyTranslate);
-        addAnimationsForProperty(rotateAnimations, AnimatedPropertyRotate);
-        addAnimationsForProperty(scaleAnimations, AnimatedPropertyScale);
-        addAnimationsForProperty(transformAnimations, AnimatedPropertyTransform);
-#else
-        auto addAnimationsForProperty = [&](const Vector<LayerPropertyAnimation*>& animations, AnimatedPropertyID property) {
-            if (animations.isEmpty()) {
-                addBaseValueTransformAnimation(property);
-                return;
-            }
-
-            LayerPropertyAnimation* earliestAnimation = nullptr;
-            Vector<RefPtr<PlatformCAAnimation>> caAnimations;
             for (auto* animation : WTF::makeReversedRange(animations)) {
                 if (auto beginTime = animation->computedBeginTime()) {
                     if (!earliestAnimation || *earliestAnimation->computedBeginTime() > *beginTime)
@@ -3182,7 +3135,6 @@
         addAnimationsForProperty(scaleAnimations, AnimatedPropertyScale);
         addAnimationsForProperty(rotateAnimations, AnimatedPropertyRotate);
         addAnimationsForProperty(translateAnimations, AnimatedPropertyTranslate);
-#endif
     }
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to