Changeset 252486 in webkit

Timestamp:

Nov 15, 2019 8:58:59 AM (4 years ago)

Author:

Simon Fraser

Message:

The image is flashing if falls out and has an animation transform: rotate
​https://bugs.webkit.org/show_bug.cgi?id=203613

Reviewed by Antti Koivisto.
Source/WebCore:

Code added in r218735 that maps the animation extent through the current animating transform
worked for translations, but not rotation where anchor point matters. This matrix
needs to take anchor point into account.

Shared some code that applies anchor point to a matrix.

Test: compositing/backing/backing-store-attachment-with-rotation.html

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::layerTransform const):
(WebCore::GraphicsLayerCA::transformByApplyingAnchorPoint const):
(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):

• platform/graphics/ca/GraphicsLayerCA.h:

LayoutTests:

• compositing/backing/backing-store-attachment-with-rotation-expected.txt: Added.
• compositing/backing/backing-store-attachment-with-rotation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/backing/backing-store-attachment-with-rotation-expected.txt (added)
• LayoutTests/compositing/backing/backing-store-attachment-with-rotation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-15  Simon Fraser  <simon.fraser@apple.com>
+
+        The image is flashing if falls out and has an animation transform: rotate
+        https://bugs.webkit.org/show_bug.cgi?id=203613
+
+        Reviewed by Antti Koivisto.
+
+        * compositing/backing/backing-store-attachment-with-rotation-expected.txt: Added.
+        * compositing/backing/backing-store-attachment-with-rotation.html: Added.
+
 2019-11-14  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-15  Simon Fraser  <simon.fraser@apple.com>
+
+        The image is flashing if falls out and has an animation transform: rotate
+        https://bugs.webkit.org/show_bug.cgi?id=203613
+
+        Reviewed by Antti Koivisto.
+        
+        Code added in r218735 that maps the animation extent through the current animating transform
+        worked for translations, but not rotation where anchor point matters. This matrix
+        needs to take anchor point into account.
+
+        Shared some code that applies anchor point to a matrix.
+
+        Test: compositing/backing/backing-store-attachment-with-rotation.html
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::layerTransform const):
+        (WebCore::GraphicsLayerCA::transformByApplyingAnchorPoint const):
+        (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+
 2019-11-15  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -1375 +1375 @@
         currentTransform = *m_transform;
     
-    if (!currentTransform.isIdentity()) {
-        FloatPoint3D absoluteAnchorPoint(anchorPoint());
-        absoluteAnchorPoint.scale(size().width(), size().height(), 1);
-        transform.translate3d(absoluteAnchorPoint.x(), absoluteAnchorPoint.y(), absoluteAnchorPoint.z());
-        transform.multiply(currentTransform);
-        transform.translate3d(-absoluteAnchorPoint.x(), -absoluteAnchorPoint.y(), -absoluteAnchorPoint.z());
-    }
+    transform.multiply(transformByApplyingAnchorPoint(currentTransform));
 
     if (GraphicsLayer* parentLayer = parent()) {
@@ -1395 +1389 @@
     
     return transform;
+}
+
+TransformationMatrix GraphicsLayerCA::transformByApplyingAnchorPoint(const TransformationMatrix& matrix) const
+{
+    if (matrix.isIdentity())
+        return matrix;
+
+    TransformationMatrix result;
+    FloatPoint3D absoluteAnchorPoint(anchorPoint());
+    absoluteAnchorPoint.scale(size().width(), size().height(), 1);
+    result.translate3d(absoluteAnchorPoint.x(), absoluteAnchorPoint.y(), absoluteAnchorPoint.z());
+    result.multiply(matrix);
+    result.translate3d(-absoluteAnchorPoint.x(), -absoluteAnchorPoint.y(), -absoluteAnchorPoint.z());
+    return result;
 }
 
@@ -1487 +1495 @@
     if (auto extent = animationExtent()) {
         // Adjust the animation extent to match the current animation position.
-        bounds = rects.animatingTransform.inverse().valueOr(TransformationMatrix()).mapRect(*extent);
+        auto animatingTransformWithAnchorPoint = transformByApplyingAnchorPoint(rects.animatingTransform);
+        bounds = animatingTransformWithAnchorPoint.inverse().valueOr(TransformationMatrix()).mapRect(*extent);
     }
 

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

@@ -307 +307 @@
 
     TransformationMatrix layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform = 0) const;
+    TransformationMatrix transformByApplyingAnchorPoint(const TransformationMatrix&) const;
 
     enum ComputeVisibleRectFlag { RespectAnimatingTransforms = 1 << 0 };