Accelerated animations of individual transform properties should apply rotate before scale

graouts · graouts · commit 09e97709cb1f · 2020-11-06T19:37:33.000Z
https://bugs.webkit.org/show_bug.cgi?id=218659 Reviewed by Simon Fraser. Not that applying scale before rotate makes any difference, but applying the operations in the order specified in the CSS Transforms spec will make the code easier to understand between this and RenderStyle::applyTransform(). No test since there is no change of behavior. * platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::GraphicsLayerCA::updateAnimations): Canonical link: https://commits.webkit.org/231322@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2020-11-06  Antoine Quint  <graouts@webkit.org>
+
+        Accelerated animations of individual transform properties should apply rotate before scale
+        https://bugs.webkit.org/show_bug.cgi?id=218659
+
+        Reviewed by Simon Fraser.
+
+        Not that applying scale before rotate makes any difference, but applying the operations in
+        the order specified in the CSS Transforms spec will make the code easier to understand between
+        this and RenderStyle::applyTransform().
+
+        No test since there is no change of behavior.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateAnimations):
+
 2020-11-06  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [Concurrent display lists] Encode display list items directly into shared memory
diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -3001,16 +3001,16 @@ void GraphicsLayerCA::updateAnimations()
         else
             addBaseValueTransformAnimation(AnimatedPropertyTranslate);
 
-        if (scaleAnimation)
-            addAnimation(*scaleAnimation);
-        else
-            addBaseValueTransformAnimation(AnimatedPropertyScale);
-
         if (rotateAnimation)
             addAnimation(*rotateAnimation);
         else
             addBaseValueTransformAnimation(AnimatedPropertyRotate);
 
+        if (scaleAnimation)
+            addAnimation(*scaleAnimation);
+        else
+            addBaseValueTransformAnimation(AnimatedPropertyScale);
+
         for (auto* animation : transformAnimations)
             addAnimation(*animation);
         if (transformAnimations.isEmpty())
@@ -3021,16 +3021,16 @@ void GraphicsLayerCA::updateAnimations()
         if (transformAnimations.isEmpty())
             addBaseValueTransformAnimation(AnimatedPropertyTransform);
 
-        if (rotateAnimation)
-            addAnimation(*rotateAnimation);
-        else
-            addBaseValueTransformAnimation(AnimatedPropertyRotate);
-
         if (scaleAnimation)
             addAnimation(*scaleAnimation);
         else
             addBaseValueTransformAnimation(AnimatedPropertyScale);
 
+        if (rotateAnimation)
+            addAnimation(*rotateAnimation);
+        else
+            addBaseValueTransformAnimation(AnimatedPropertyRotate);
+
         if (translateAnimation)
             addAnimation(*translateAnimation);
         else
