Changeset 285631 in webkit


Ignore:
Timestamp:
Nov 11, 2021 7:55:11 AM (8 months ago)
Author:
graouts@webkit.org
Message:

Improve additivity support when animating the transform property
​https://bugs.webkit.org/show_bug.cgi?id=232990

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Mark 91 new PASS results.

  • web-platform-tests/css/css-transforms/animation/composited-transform-expected.txt:
  • web-platform-tests/css/css-transforms/animation/transform-composition-expected.txt:
  • web-platform-tests/css/css-transforms/animation/transform-matrix-composition-expected.txt:
  • web-platform-tests/css/css-transforms/animation/transform-perspective-composition-expected.txt:
  • web-platform-tests/css/css-transforms/animation/transform-rotate-composition-expected.txt:
  • web-platform-tests/css/css-transforms/animation/transform-skew-composition-expected.txt:
  • web-platform-tests/css/css-transforms/animation/transform-translate-composition-expected.txt:
  • web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt:

Source/WebCore:

When blending TransformOperations with the "add" composite operation, we should
simply concatenate the from and to transform operations.

  • animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r285624 r285631  
     12021-11-11  Antoine Quint  <graouts@webkit.org>
     2
     3        Improve additivity support when animating the transform property
     4        https://bugs.webkit.org/show_bug.cgi?id=232990
     5
     6        Reviewed by Dean Jackson.
     7
     8        Mark 91 new PASS results.
     9
     10        * web-platform-tests/css/css-transforms/animation/composited-transform-expected.txt:
     11        * web-platform-tests/css/css-transforms/animation/transform-composition-expected.txt:
     12        * web-platform-tests/css/css-transforms/animation/transform-matrix-composition-expected.txt:
     13        * web-platform-tests/css/css-transforms/animation/transform-perspective-composition-expected.txt:
     14        * web-platform-tests/css/css-transforms/animation/transform-rotate-composition-expected.txt:
     15        * web-platform-tests/css/css-transforms/animation/transform-skew-composition-expected.txt:
     16        * web-platform-tests/css/css-transforms/animation/transform-translate-composition-expected.txt:
     17        * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt:
     18
    1192021-11-11  Antti Koivisto  <antti@apple.com>
    220

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/composited-transform-expected.txt

    r267570 r285631  
    11
    2 FAIL An additive transform animation on-top of a replace transform animation should composite correctly assert_equals: expected "matrix(1, 0, 0, 1, 20, 80)" but got "matrix(1, 0, 0, 1, 0, 80)"
     2PASS An additive transform animation on-top of a replace transform animation should composite correctly
    33

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/transform-composition-expected.txt

    r285397 r285631  
    11
    2 FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (-0.5) should be [rotateX(50deg) rotateY(50deg) translate(-40px, -80px)] assert_equals: expected "matrix3d ( 0.64 , 0.59 , - 0.49 , 0 , 0 , 0.64 , 0.77 , 0 , 0.77 , - 0.49 , 0.41 , 0 , - 25.71 , - 74.9 , - 41.59 , 1 ) " but got "matrix3d ( 0.06 , - 0.94 , - 0.33 , 0 , 1 , 0.06 , 0.01 , 0 , 0.01 , - 0.33 , 0.94 , 0 , 66.68 , 126.93 , 55.3 , 1 ) "
    3 FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0) should be [rotateX(100deg) rotateY(100deg) translate(10px, 20px)] assert_equals: expected "matrix3d ( - 0.17 , 0.97 , 0.17 , 0 , 0 , - 0.17 , 0.98 , 0 , 0.98 , 0.17 , 0.03 , 0 , - 1.74 , 6.23 , 21.41 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 10 , 20 ) "
    4 FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0.25) should be [rotateX(125deg) rotateY(125deg) translate(35px, 70px)] assert_equals: expected "matrix3d ( - 0.57 , 0.67 , 0.47 , 0 , 0 , - 0.57 , 0.82 , 0 , 0.82 , 0.47 , 0.33 , 0 , - 20.08 , - 16.66 , 73.79 , 1 ) " but got "matrix3d ( 0.73 , 0.68 , 0.07 , 0 , - 0.67 , 0.73 , - 0.17 , 0 , - 0.17 , 0.07 , 0.98 , 0 , - 18.34 , - 33.47 , - 27.65 , 1 ) "
    5 FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0.5) should be [rotateX(150deg) rotateY(150deg) translate(60px, 120px)] assert_equals: expected "matrix3d ( - 0.87 , 0.25 , 0.43 , 0 , 0 , - 0.87 , 0.5 , 0 , 0.5 , 0.43 , 0.75 , 0 , - 51.96 , - 88.92 , 85.98 , 1 ) " but got "matrix3d ( 0.06 , 1 , 0.01 , 0 , - 0.94 , 0.06 , - 0.33 , 0 , - 0.33 , 0.01 , 0.94 , 0 , - 46.68 , - 86.93 , - 55.3 , 1 ) "
    6 FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0.75) should be [rotateX(175deg) rotateY(175deg) translate(85px, 170px)] assert_equals: expected "matrix3d ( - 1 , 0.01 , 0.09 , 0 , 0 , - 1 , 0.09 , 0 , 0.09 , 0.09 , 0.99 , 0 , - 84.68 , - 168.71 , 22.2 , 1 ) " but got "matrix3d ( - 0.63 , 0.77 , - 0.15 , 0 , - 0.67 , - 0.63 , - 0.4 , 0 , - 0.4 , - 0.15 , 0.9 , 0 , - 75.02 , - 140.4 , - 82.95 , 1 ) "
     2FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (-0.5) should be [rotateX(50deg) rotateY(50deg) translate(-40px, -80px)] assert_equals: expected "matrix3d ( 0.64 , 0.59 , - 0.49 , 0 , 0 , 0.64 , 0.77 , 0 , 0.77 , - 0.49 , 0.41 , 0 , - 25.71 , - 74.9 , - 41.59 , 1 ) " but got "matrix3d ( 0.18 , 0.86 , - 0.47 , 0 , 0.76 , 0.18 , 0.63 , 0 , 0.63 , - 0.47 , - 0.62 , 0 , 49.08 , 106.27 , 87.41 , 1 ) "
     3PASS Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0) should be [rotateX(100deg) rotateY(100deg) translate(10px, 20px)]
     4FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0.25) should be [rotateX(125deg) rotateY(125deg) translate(35px, 70px)] assert_equals: expected "matrix3d ( - 0.57 , 0.67 , 0.47 , 0 , 0 , - 0.57 , 0.82 , 0 , 0.82 , 0.47 , 0.33 , 0 , - 20.08 , - 16.66 , 73.79 , 1 ) " but got "matrix3d ( - 0.5 , 0.81 , 0.31 , 0 , - 0.3 , - 0.5 , 0.81 , 0 , 0.81 , 0.31 , 0.49 , 0 , - 27.14 , - 43.8 , - 11.59 , 1 ) "
     5FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0.5) should be [rotateX(150deg) rotateY(150deg) translate(60px, 120px)] assert_equals: expected "matrix3d ( - 0.87 , 0.25 , 0.43 , 0 , 0 , - 0.87 , 0.5 , 0 , 0.5 , 0.43 , 0.75 , 0 , - 51.96 , - 88.92 , 85.98 , 1 ) " but got "matrix3d ( - 0.79 , 0.56 , 0.25 , 0 , - 0.42 , - 0.79 , 0.45 , 0 , 0.45 , 0.25 , 0.85 , 0 , - 52.55 , - 93.82 , - 44.6 , 1 ) "
     6FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (0.75) should be [rotateX(175deg) rotateY(175deg) translate(85px, 170px)] assert_equals: expected "matrix3d ( - 1 , 0.01 , 0.09 , 0 , 0 , - 1 , 0.09 , 0 , 0.09 , 0.09 , 0.99 , 0 , - 84.68 , - 168.71 , 22.2 , 1 ) " but got "matrix3d ( - 0.95 , 0.3 , 0.02 , 0 , - 0.3 , - 0.95 , 0.02 , 0 , 0.02 , 0.02 , 1 , 0 , - 77.96 , - 143.84 , - 77.6 , 1 ) "
    77PASS Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (1) should be [rotateX(200deg) rotateY(200deg) translate(110px, 220px)]
    8 FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (1.5) should be [rotateX(250deg) rotateY(250deg) translate(160px, 320px)] assert_equals: expected "matrix3d ( - 0.34 , 0.88 , - 0.32 , 0 , 0 , - 0.34 , - 0.94 , 0 , - 0.94 , - 0.32 , 0.12 , 0 , - 54.72 , 31.84 , - 352.12 , 1 ) " but got "matrix3d ( - 0.06 , - 0.93 , - 0.35 , 0 , 1 , - 0.06 , - 0.01 , 0 , - 0.01 , - 0.35 , 0.94 , 0 , - 160.05 , - 300.8 , - 165.9 , 1 ) "
    9 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (-0.5) should be [rotateX(45deg) rotateY(-180deg)] assert_equals: expected "matrix3d ( - 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , 0.71 , - 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    10 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0) should be [rotateX(45deg) rotateY(0deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    11 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0.25) should be [rotateX(45deg) rotateY(90deg)] assert_equals: expected "matrix3d ( 0 , 0.71 , - 0.71 , 0 , 0 , 0.71 , 0.71 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    12 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0.5) should be [rotateX(45deg) rotateY(180deg)] assert_equals: expected "matrix3d ( - 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , 0.71 , - 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    13 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0.75) should be [rotateX(45deg) rotateY(270deg)] assert_equals: expected "matrix3d ( 0 , - 0.71 , 0.71 , 0 , 0 , 0.71 , 0.71 , 0 , - 1 , 0 , 0 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    14 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (1) should be [rotateX(45deg) rotateY(360deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    15 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (1.5) should be [rotateX(45deg) rotateY(540deg)] assert_equals: expected "matrix3d ( - 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , 0.71 , - 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    16 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (-0.5) should be [matrix3d(0.5, 0, 0, 0, 0, 1.11022e-16, 0.5, 0, 0, -1, 2.22045e-16, 0, 150, 9.18485e-15, 150, 1)] assert_equals: expected "matrix3d ( 0.5 , 0 , 0 , 0 , 0 , 0 , 0.5 , 0 , 0 , - 1 , 0 , 0 , 150 , 0 , 150 , 1 ) " but got "matrix ( 0.5 , 0 , 0 , 0.5 , 150 , 150 ) "
    17 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0) should be [matrix3d(1, 0, 0, 0, 0, 6.12323e-17, 1, 0, 0, -1, 6.12323e-17, 0, 100, 6.12323e-15, 100, 1)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , - 1 , 0 , 0 , 100 , 0 , 100 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 100 , 100 ) "
    18 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0.25) should be [matrix3d(1.25, 0, 0, 0, 0, 2.77556e-16, 1.25, 0, 0, -1, 2.22045e-16, 0, 75, 4.59243e-15, 75, 1)] assert_equals: expected "matrix3d ( 1.25 , 0 , 0 , 0 , 0 , 0 , 1.25 , 0 , 0 , - 1 , 0 , 0 , 75 , 0 , 75 , 1 ) " but got "matrix ( 1.25 , 0 , 0 , 1.25 , 75 , 75 ) "
    19 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0.5) should be [matrix3d(1.5, 0, 0, 0, 0, 3.33067e-16, 1.5, 0, 0, -1, 2.22045e-16, 0, 50, 3.06162e-15, 50, 1)] assert_equals: expected "matrix3d ( 1.5 , 0 , 0 , 0 , 0 , 0 , 1.5 , 0 , 0 , - 1 , 0 , 0 , 50 , 0 , 50 , 1 ) " but got "matrix ( 1.5 , 0 , 0 , 1.5 , 50 , 50 ) "
    20 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0.75) should be [matrix3d(1.75, 0, 0, 0, 0, 3.88578e-16, 1.75, 0, 0, -1, 2.22045e-16, 0, 25, 1.53081e-15, 25, 1)] assert_equals: expected "matrix3d ( 1.75 , 0 , 0 , 0 , 0 , 0 , 1.75 , 0 , 0 , - 1 , 0 , 0 , 25 , 0 , 25 , 1 ) " but got "matrix ( 1.75 , 0 , 0 , 1.75 , 25 , 25 ) "
    21 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (1) should be [matrix3d(2, 0, 0, 0, 0, 1.22465e-16, 2, 0, 0, -1, 6.12323e-17, 0, 0, 0, 0, 1)] assert_equals: expected "matrix3d ( 2 , 0 , 0 , 0 , 0 , 0 , 2 , 0 , 0 , - 1 , 0 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix ( 2 , 0 , 0 , 2 , 0 , 0 ) "
    22 FAIL Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (1.5) should be [matrix3d(2.5, 0, 0, 0, 0, 5.55112e-16, 2.5, 0, 0, -1, 2.22045e-16, 0, -50, -3.06162e-15, -50, 1)] assert_equals: expected "matrix3d ( 2.5 , 0 , 0 , 0 , 0 , 0 , 2.5 , 0 , 0 , - 1 , 0 , 0 , - 50 , 0 , - 50 , 1 ) " but got "matrix ( 2.5 , 0 , 0 , 2.5 , - 50 , - 50 ) "
    23 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (-0.5) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    24 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 0 , 0 ) "
    25 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0.25) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    26 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0.5) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    27 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0.75) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    28 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (1) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
    29 FAIL Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (1.5) should be [rotateX(45deg)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 0.71 , 0.71 , 0 , 0 , - 0.71 , 0.71 , 0 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 ) "
     8FAIL Compositing: property <transform> underlying [rotateX(100deg) rotateY(100deg)] from add [translate(10px, 20px)] to replace [rotateX(200deg) rotateY(200deg) translate(110px, 220px)] at (1.5) should be [rotateX(250deg) rotateY(250deg) translate(160px, 320px)] assert_equals: expected "matrix3d ( - 0.34 , 0.88 , - 0.32 , 0 , 0 , - 0.34 , - 0.94 , 0 , - 0.94 , - 0.32 , 0.12 , 0 , - 54.72 , 31.84 , - 352.12 , 1 ) " but got "matrix3d ( - 0.45 , 0.16 , - 0.88 , 0 , 0.76 , - 0.45 , - 0.47 , 0 , - 0.47 , - 0.88 , 0.08 , 0 , - 154.18 , - 293.91 , - 176.6 , 1 ) "
     9PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (-0.5) should be [rotateX(45deg) rotateY(-180deg)]
     10PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0) should be [rotateX(45deg) rotateY(0deg)]
     11PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0.25) should be [rotateX(45deg) rotateY(90deg)]
     12PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0.5) should be [rotateX(45deg) rotateY(180deg)]
     13PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (0.75) should be [rotateX(45deg) rotateY(270deg)]
     14PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (1) should be [rotateX(45deg) rotateY(360deg)]
     15PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [none] to add [rotateY(360deg)] at (1.5) should be [rotateX(45deg) rotateY(540deg)]
     16PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (-0.5) should be [matrix3d(0.5, 0, 0, 0, 0, 1.11022e-16, 0.5, 0, 0, -1, 2.22045e-16, 0, 150, 9.18485e-15, 150, 1)]
     17PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0) should be [matrix3d(1, 0, 0, 0, 0, 6.12323e-17, 1, 0, 0, -1, 6.12323e-17, 0, 100, 6.12323e-15, 100, 1)]
     18PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0.25) should be [matrix3d(1.25, 0, 0, 0, 0, 2.77556e-16, 1.25, 0, 0, -1, 2.22045e-16, 0, 75, 4.59243e-15, 75, 1)]
     19PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0.5) should be [matrix3d(1.5, 0, 0, 0, 0, 3.33067e-16, 1.5, 0, 0, -1, 2.22045e-16, 0, 50, 3.06162e-15, 50, 1)]
     20PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (0.75) should be [matrix3d(1.75, 0, 0, 0, 0, 3.88578e-16, 1.75, 0, 0, -1, 2.22045e-16, 0, 25, 1.53081e-15, 25, 1)]
     21PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (1) should be [matrix3d(2, 0, 0, 0, 0, 1.22465e-16, 2, 0, 0, -1, 6.12323e-17, 0, 0, 0, 0, 1)]
     22PASS Compositing: property <transform> underlying [rotateX(90deg)] from add [translate(100px, 100px)] to add [scale(2)] at (1.5) should be [matrix3d(2.5, 0, 0, 0, 0, 5.55112e-16, 2.5, 0, 0, -1, 2.22045e-16, 0, -50, -3.06162e-15, -50, 1)]
     23PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (-0.5) should be [rotateX(45deg)]
     24PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0) should be [rotateX(45deg)]
     25PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0.25) should be [rotateX(45deg)]
     26PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0.5) should be [rotateX(45deg)]
     27PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (0.75) should be [rotateX(45deg)]
     28PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (1) should be [rotateX(45deg)]
     29PASS Compositing: property <transform> underlying [rotateX(45deg)] from add [scaleX(1)] to add [rotateY(360deg)] at (1.5) should be [rotateX(45deg)]
    3030

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/transform-matrix-composition-expected.txt

    r270801 r285631  
    11
    2 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(0, 1, -1, 0, 100, 50)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 50 ) " but got "matrix ( 1 , 0 , 0 , 1 , 50 , 0 ) "
    3 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(0, 1, -1, 0, 100, 100)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 100 ) " but got "matrix ( 1 , 0 , 0 , 1 , 100 , 0 ) "
    4 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.25) should be [matrix(0, 1, -1, 0, 100, 125)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 125 ) " but got "matrix ( 1 , 0 , 0 , 1 , 125 , 0 ) "
    5 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.5) should be [matrix(0, 1, -1, 0, 100, 150)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 150 ) " but got "matrix ( 1 , 0 , 0 , 1 , 150 , 0 ) "
    6 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.75) should be [matrix(0, 1, -1, 0, 100, 175)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 175 ) " but got "matrix ( 1 , 0 , 0 , 1 , 175 , 0 ) "
    7 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1) should be [matrix(0, 1, -1, 0, 100, 200)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 200 ) " but got "matrix ( 1 , 0 , 0 , 1 , 200 , 0 ) "
    8 FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1.5) should be [matrix(0, 1, -1, 0, 100, 250)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 250 ) " but got "matrix ( 1 , 0 , 0 , 1 , 250 , 0 ) "
    9 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (-0.5) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(50px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 142.68 , 7.32 , - 25 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 50 , 0 ) "
    10 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(100px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 185.36 , 14.64 , - 50 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 100 , 0 ) "
    11 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0.25) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(125px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 206.69 , 18.31 , - 62.5 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 125 , 0 ) "
    12 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0.5) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(150px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 228.03 , 21.97 , - 75 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 150 , 0 ) "
    13 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0.75) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(175px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 249.37 , 25.63 , - 87.5 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 175 , 0 ) "
    14 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (1) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(200px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 270.71 , 29.29 , - 100 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 200 , 0 ) "
    15 FAIL Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (1.5) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(250px)] assert_equals: expected "matrix3d ( 0.85 , 0.15 , - 0.5 , 0 , 0.15 , 0.85 , 0.5 , 0 , 0.5 , - 0.5 , 0.71 , 0 , 313.39 , 36.61 , - 125 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 250 , 0 ) "
    16 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(1, 1, 0, 0, 100, 200)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 200 ) " but got "matrix ( 1 , 0 , 0 , 1 , 50 , 0 ) "
    17 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(1, 1, 0, 0, 100, 200)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 200 ) " but got "matrix ( 1 , 0 , 0 , 1 , 100 , 0 ) "
    18 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.25) should be [matrix(1, 1, 0, 0, 100, 200)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 200 ) " but got "matrix ( 1 , 0 , 0 , 1 , 125 , 0 ) "
    19 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.5) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 0 , 0 , 1 , 150 , 0 ) "
    20 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.75) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 0 , 0 , 1 , 175 , 0 ) "
    21 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 0 , 0 , 1 , 200 , 0 ) "
    22 FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1.5) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 0 , 0 , 1 , 250 , 0 ) "
    23 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(1, 1, 0, 0, 100, 100)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 100 ) " but got "matrix ( 1.28 , 0.84 , - 0.03 , 0.3 , 87.5 , - 37.5 ) "
    24 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(1, 1, 0, 0, 100, 100)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 100 ) " but got "matrix ( 1 , 1 , 0 , 0 , 0 , 100 ) "
    25 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.25) should be [matrix(1, 1, 0, 0, 100, 100)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 100 ) " but got "matrix ( 0.95 , 0.86 , - 0.01 , 0.08 , 59.37 , 65.62 ) "
    26 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.5) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 0.95 , 0.63 , - 0.03 , 0.3 , 87.5 , 62.5 ) "
    27 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.75) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 0.97 , 0.32 , - 0.04 , 0.63 , 134.38 , 40.63 ) "
    28 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 1 , 0 , 0 , 1 , 200 , 0 ) "
    29 FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1.5) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 0.99 , - 0.56 , 0.37 , 1.59 , 387.5 , - 137.5 ) "
     2PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(0, 1, -1, 0, 100, 50)]
     3PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(0, 1, -1, 0, 100, 100)]
     4PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.25) should be [matrix(0, 1, -1, 0, 100, 125)]
     5PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.5) should be [matrix(0, 1, -1, 0, 100, 150)]
     6PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.75) should be [matrix(0, 1, -1, 0, 100, 175)]
     7PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1) should be [matrix(0, 1, -1, 0, 100, 200)]
     8PASS Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1.5) should be [matrix(0, 1, -1, 0, 100, 250)]
     9PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (-0.5) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(50px)]
     10PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(100px)]
     11PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0.25) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(125px)]
     12PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0.5) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(150px)]
     13PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (0.75) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(175px)]
     14PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (1) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(200px)]
     15PASS Compositing: property <transform> underlying [matrix3d(0.8535533905932737,0.1464466094067262,-0.5,0,0.1464466094067262,0.8535533905932737,0.5,0,0.5,-0.5,0.7071067811865476,0,100,0,0,1)] from add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 100, 0, 0, 1)] to add [matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 200, 0, 0, 1)] at (1.5) should be [translateX(100px) rotate3d(1, 1, 0, 45deg) translateX(250px)]
     16FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(1, 1, 0, 0, 100, 200)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 200 ) " but got "matrix ( 1 , 1 , 0 , 0 , 100 , 100 ) "
     17PASS Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(1, 1, 0, 0, 100, 200)]
     18FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.25) should be [matrix(1, 1, 0, 0, 100, 200)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 200 ) " but got "matrix ( 1 , 1 , 0 , 0 , 175 , 175 ) "
     19FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.5) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 1 , 0 , 0 , 200 , 200 ) "
     20FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.75) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 1 , 0 , 0 , 225 , 225 ) "
     21PASS Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1) should be [matrix(1, 1, 0, 0, 200, 300)]
     22FAIL Compositing: property <transform> underlying [matrix(1, 1, 0, 0, 0, 100)] from add [matrix(1, 0, 0, 1, 100, 0)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1.5) should be [matrix(1, 1, 0, 0, 200, 300)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 200 , 300 ) " but got "matrix ( 1 , 1 , 0 , 0 , 300 , 300 ) "
     23FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(1, 1, 0, 0, 100, 100)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 100 ) " but got "matrix ( 1.28 , 0.84 , - 0.03 , 0.3 , 187.5 , - 37.5 ) "
     24PASS Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(1, 1, 0, 0, 100, 100)]
     25FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.25) should be [matrix(1, 1, 0, 0, 100, 100)] assert_equals: expected "matrix ( 1 , 1 , 0 , 0 , 100 , 100 ) " but got "matrix ( 0.95 , 0.86 , - 0.01 , 0.08 , 159.38 , 65.62 ) "
     26FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.5) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 0.95 , 0.63 , - 0.03 , 0.3 , 187.5 , 62.5 ) "
     27FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (0.75) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 0.97 , 0.32 , - 0.04 , 0.63 , 234.38 , 40.63 ) "
     28PASS Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1) should be [matrix(1, 0, 0, 1, 300, 0)]
     29FAIL Compositing: property <transform> underlying [matrix(1, 0, 0, 1, 100, 0)] from add [matrix(1, 1, 0, 0, 0, 100)] to add [matrix(1, 0, 0, 1, 200, 0)] at (1.5) should be [matrix(1, 0, 0, 1, 300, 0)] assert_equals: expected "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) " but got "matrix ( 0.99 , - 0.56 , 0.37 , 1.59 , 487.5 , - 137.5 ) "
    3030FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from accumulate [matrix(1, 0, 0, 1, 100, 0)] to accumulate [matrix(1, 0, 0, 1, 200, 0)] at (-0.5) should be [matrix(0, 1, -1, 0, 150, 0)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 150 , 0 ) " but got "matrix ( 1 , 0 , 0 , 1 , 50 , 0 ) "
    3131FAIL Compositing: property <transform> underlying [matrix(0, 1, -1, 0, 100, 0)] from accumulate [matrix(1, 0, 0, 1, 100, 0)] to accumulate [matrix(1, 0, 0, 1, 200, 0)] at (0) should be [matrix(0, 1, -1, 0, 200, 0)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 200 , 0 ) " but got "matrix ( 1 , 0 , 0 , 1 , 100 , 0 ) "

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/transform-perspective-composition-expected.txt

    r267570 r285631  
    11
    2 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (-0.5) should be [perspective(4.12px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.24 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.14 , 0 , 0 , 0 , 1 ) "
    3 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0) should be [perspective(5px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.2 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.1 , 0 , 0 , 0 , 1 ) "
    4 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0.25) should be [perspective(5.45px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.18 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.08 , 0 , 0 , 0 , 1 ) "
    5 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0.5) should be [perspective(6.15px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.16 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.06 , 0 , 0 , 0 , 1 ) "
    6 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0.75) should be [perspective(7.06px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.14 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.04 , 0 , 0 , 0 , 1 ) "
    7 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (1) should be [perspective(8.33px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.12 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.02 , 0 , 0 , 0 , 1 ) "
    8 FAIL Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (1.5) should be [perspective(10px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.1 , 0 , 0 , 0 , 1 ) " but got "matrix ( 1 , 0 , 0 , 1 , 0 , 0 ) "
     2PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (-0.5) should be [perspective(4.12px)]
     3PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0) should be [perspective(5px)]
     4PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0.25) should be [perspective(5.45px)]
     5PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0.5) should be [perspective(6.15px)]
     6PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (0.75) should be [perspective(7.06px)]
     7PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (1) should be [perspective(8.33px)]
     8PASS Compositing: property <transform> underlying [perspective(10px)] from add [perspective(10px)] to add [perspective(50px)] at (1.5) should be [perspective(10px)]
    99FAIL Compositing: property <transform> underlying [perspective(10px)] from accumulate [perspective(10px)] to accumulate [perspective(50px)] at (-0.5) should be [perspective(4.12px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.24 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.14 , 0 , 0 , 0 , 1 ) "
    1010FAIL Compositing: property <transform> underlying [perspective(10px)] from accumulate [perspective(10px)] to accumulate [perspective(50px)] at (0) should be [perspective(5px)] assert_equals: expected "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.2 , 0 , 0 , 0 , 1 ) " but got "matrix3d ( 1 , 0 , 0 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 1 , - 0.1 , 0 , 0 , 0 , 1 ) "

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/transform-rotate-composition-expected.txt

    r285397 r285631  
    2121PASS Compositing: property <transform> underlying [rotateZ(20deg)] from add [rotateZ(40deg)] to add [rotateZ(60deg)] at (1) should be [rotateZ(80deg)]
    2222PASS Compositing: property <transform> underlying [rotateZ(20deg)] from add [rotateZ(40deg)] to add [rotateZ(60deg)] at (1.5) should be [rotateZ(90deg)]
    23 FAIL Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (-0.5) should be [rotate(45deg) skew(10deg, 20deg) rotate(-45deg)] assert_equals: expected "matrix ( 0.73 , 0.09 , - 0.09 , 1.27 , 0 , 0 ) " but got "matrix ( 1 , 0.36 , 0.18 , 1 , 0 , 0 ) "
    24 FAIL Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0) should be [rotate(45deg) skew(10deg, 20deg) rotate(45deg)] assert_equals: expected "matrix ( - 0.09 , 1.27 , - 0.73 , - 0.09 , 0 , 0 ) " but got "matrix ( - 0.36 , 1 , - 1 , 0.18 , 0 , 0 ) "
    25 FAIL Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0.25) should be [rotate(45deg) skew(10deg, 20deg) rotate(90deg)] assert_equals: expected "matrix ( - 0.58 , 0.83 , - 0.45 , - 0.96 , 0 , 0 ) " but got "matrix ( - 0.96 , 0.45 , - 0.83 , - 0.58 , 0 , 0 ) "
    26 FAIL Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0.5) should be [rotate(45deg) skew(10deg, 20deg) rotate(135deg)] assert_equals: expected "matrix ( - 0.73 , - 0.09 , 0.09 , - 1.27 , 0 , 0 ) " but got "matrix ( - 1 , - 0.36 , - 0.18 , - 1 , 0 , 0 ) "
     23PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (-0.5) should be [rotate(45deg) skew(10deg, 20deg) rotate(-45deg)]
     24PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0) should be [rotate(45deg) skew(10deg, 20deg) rotate(45deg)]
     25PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0.25) should be [rotate(45deg) skew(10deg, 20deg) rotate(90deg)]
     26PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0.5) should be [rotate(45deg) skew(10deg, 20deg) rotate(135deg)]
    2727PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (0.75) should be [rotate(45deg) skew(10deg, 20deg) rotate(180deg)]
    28 FAIL Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (1) should be [rotate(45deg) skew(10deg, 20deg) rotate(225deg)] assert_equals: expected "matrix ( 0.09 , - 1.27 , 0.73 , 0.09 , 0 , 0 ) " but got "matrix ( 0.36 , - 1 , 1 , - 0.18 , 0 , 0 ) "
    29 FAIL Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (1.5) should be [rotate(45deg) skew(10deg, 20deg) rotate(315deg)] assert_equals: expected "matrix ( 0.73 , 0.09 , - 0.09 , 1.27 , 0 , 0 ) " but got "matrix ( 1 , 0.36 , 0.18 , 1 , 0 , 0 ) "
     28PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (1) should be [rotate(45deg) skew(10deg, 20deg) rotate(225deg)]
     29PASS Compositing: property <transform> underlying [rotate(45deg) skew(10deg, 20deg)] from add [rotate(45deg)] to add [rotate(225deg)] at (1.5) should be [rotate(45deg) skew(10deg, 20deg) rotate(315deg)]
    3030PASS Compositing: property <transform> underlying [rotateX(20deg)] from accumulate [rotateX(40deg)] to accumulate [rotateX(60deg)] at (-0.5) should be [rotateX(50deg)]
    3131PASS Compositing: property <transform> underlying [rotateX(20deg)] from accumulate [rotateX(40deg)] to accumulate [rotateX(60deg)] at (0) should be [rotateX(60deg)]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/transform-skew-composition-expected.txt

    r285397 r285631  
    11
    2 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (-0.5) should be [skewX(10deg) skewX(20deg)] assert_equals: expected "matrix ( 1 , 0 , 0.54 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 0.58 , 1 , 0 , 0 ) "
    3 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0) should be [skewX(10deg) skewX(30deg)] assert_equals: expected "matrix ( 1 , 0 , 0.75 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 0.84 , 1 , 0 , 0 ) "
    4 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0.25) should be [skewX(10deg) skewX(35deg)] assert_equals: expected "matrix ( 1 , 0 , 0.88 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 1 , 1 , 0 , 0 ) "
    5 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0.5) should be [skewX(10deg) skewX(40deg)] assert_equals: expected "matrix ( 1 , 0 , 1.02 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 1.19 , 1 , 0 , 0 ) "
    6 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0.75) should be [skewX(10deg) skewX(45deg)] assert_equals: expected "matrix ( 1 , 0 , 1.18 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 1.43 , 1 , 0 , 0 ) "
    7 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (1) should be [skewX(10deg) skewX(50deg)] assert_equals: expected "matrix ( 1 , 0 , 1.37 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 1.73 , 1 , 0 , 0 ) "
    8 FAIL Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (1.5) should be [skewX(10deg) skewX(60deg)] assert_equals: expected "matrix ( 1 , 0 , 1.91 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0 , 2.75 , 1 , 0 , 0 ) "
    9 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (-0.5) should be [skewY(10deg) skewY(20deg)] assert_equals: expected "matrix ( 1 , 0.54 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0.58 , 0 , 1 , 0 , 0 ) "
    10 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0) should be [skewY(10deg) skewY(30deg)] assert_equals: expected "matrix ( 1 , 0.75 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 0.84 , 0 , 1 , 0 , 0 ) "
    11 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0.25) should be [skewY(10deg) skewY(35deg)] assert_equals: expected "matrix ( 1 , 0.88 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 1 , 0 , 1 , 0 , 0 ) "
    12 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0.5) should be [skewY(10deg) skewY(40deg)] assert_equals: expected "matrix ( 1 , 1.02 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 1.19 , 0 , 1 , 0 , 0 ) "
    13 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0.75) should be [skewY(10deg) skewY(45deg)] assert_equals: expected "matrix ( 1 , 1.18 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 1.43 , 0 , 1 , 0 , 0 ) "
    14 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (1) should be [skewY(10deg) skewY(50deg)] assert_equals: expected "matrix ( 1 , 1.37 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 1.73 , 0 , 1 , 0 , 0 ) "
    15 FAIL Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (1.5) should be [skewY(10deg) skewY(60deg)] assert_equals: expected "matrix ( 1 , 1.91 , 0 , 1 , 0 , 0 ) " but got "matrix ( 1 , 2.75 , 0 , 1 , 0 , 0 ) "
    16 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (-0.5) should be [skew(10deg, 20deg) skew(20deg, -10deg)] assert_equals: expected "matrix ( 0.97 , 0.19 , 0.54 , 1.13 , 0 , 0 ) " but got "matrix ( 1 , 0.18 , 0.58 , 1 , 0 , 0 ) "
    17 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0) should be [skew(10deg, 20deg) skew(30deg, 10deg)] assert_equals: expected "matrix ( 1.03 , 0.54 , 0.75 , 1.21 , 0 , 0 ) " but got "matrix ( 1 , 0.58 , 0.84 , 1 , 0 , 0 ) "
    18 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0.25) should be [skew(10deg, 20deg) skew(35deg, 20deg)] assert_equals: expected "matrix ( 1.06 , 0.73 , 0.88 , 1.25 , 0 , 0 ) " but got "matrix ( 1 , 0.84 , 1 , 1 , 0 , 0 ) "
    19 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0.5) should be [skew(10deg, 20deg) skew(40deg, 30deg)] assert_equals: expected "matrix ( 1.1 , 0.94 , 1.02 , 1.31 , 0 , 0 ) " but got "matrix ( 1 , 1.19 , 1.19 , 1 , 0 , 0 ) "
    20 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0.75) should be [skew(10deg, 20deg) skew(45deg, 40deg)] assert_equals: expected "matrix ( 1.15 , 1.2 , 1.18 , 1.36 , 0 , 0 ) " but got "matrix ( 1 , 1.73 , 1.43 , 1 , 0 , 0 ) "
    21 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (1) should be [skew(10deg, 20deg) skew(50deg, 50deg)] assert_equals: expected "matrix ( 1.21 , 1.56 , 1.37 , 1.43 , 0 , 0 ) " but got "matrix ( 1 , 2.75 , 1.73 , 1 , 0 , 0 ) "
    22 FAIL Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (1.5) should be [skew(10deg, 20deg) skew(60deg, 70deg)] assert_equals: expected "matrix ( 1.48 , 3.11 , 1.91 , 1.63 , 0 , 0 ) " but got "matrix ( 1 , 16331239353195370 , 2.75 , 1 , 0 , 0 ) "
     2PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (-0.5) should be [skewX(10deg) skewX(20deg)]
     3PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0) should be [skewX(10deg) skewX(30deg)]
     4PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0.25) should be [skewX(10deg) skewX(35deg)]
     5PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0.5) should be [skewX(10deg) skewX(40deg)]
     6PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (0.75) should be [skewX(10deg) skewX(45deg)]
     7PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (1) should be [skewX(10deg) skewX(50deg)]
     8PASS Compositing: property <transform> underlying [skewX(10deg)] from add [skewX(30deg)] to add [skewX(50deg)] at (1.5) should be [skewX(10deg) skewX(60deg)]
     9PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (-0.5) should be [skewY(10deg) skewY(20deg)]
     10PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0) should be [skewY(10deg) skewY(30deg)]
     11PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0.25) should be [skewY(10deg) skewY(35deg)]
     12PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0.5) should be [skewY(10deg) skewY(40deg)]
     13PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (0.75) should be [skewY(10deg) skewY(45deg)]
     14PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (1) should be [skewY(10deg) skewY(50deg)]
     15PASS Compositing: property <transform> underlying [skewY(10deg)] from add [skewY(30deg)] to add [skewY(50deg)] at (1.5) should be [skewY(10deg) skewY(60deg)]
     16PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (-0.5) should be [skew(10deg, 20deg) skew(20deg, -10deg)]
     17PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0) should be [skew(10deg, 20deg) skew(30deg, 10deg)]
     18PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0.25) should be [skew(10deg, 20deg) skew(35deg, 20deg)]
     19PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0.5) should be [skew(10deg, 20deg) skew(40deg, 30deg)]
     20PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (0.75) should be [skew(10deg, 20deg) skew(45deg, 40deg)]
     21PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (1) should be [skew(10deg, 20deg) skew(50deg, 50deg)]
     22PASS Compositing: property <transform> underlying [skew(10deg, 20deg)] from add [skew(30deg, 10deg)] to add [skew(50deg, 50deg)] at (1.5) should be [skew(10deg, 20deg) skew(60deg, 70deg)]
    2323PASS Compositing: property <transform> underlying [skewX(45deg)] from accumulate [skewX(30deg)] to accumulate [skewX(70deg)] at (-0.5) should be [skewX(55deg)]
    2424PASS Compositing: property <transform> underlying [skewX(45deg)] from accumulate [skewX(30deg)] to accumulate [skewX(70deg)] at (0) should be [skewX(75deg)]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-transforms/animation/transform-translate-composition-expected.txt

    r285397 r285631  
    1414PASS Compositing: property <transform> underlying [translate(10px, 20px)] from add [translate(100px, 200px)] to replace [translate(210px, 420px)] at (1) should be [translate(210px, 420px)]
    1515PASS Compositing: property <transform> underlying [translate(10px, 20px)] from add [translate(100px, 200px)] to replace [translate(210px, 420px)] at (1.5) should be [translate(260px, 520px)]
    16 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (-0.5) should be [translateX(100px) rotate(90deg) translateX(50px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 50 ) " but got "matrix ( 1 , 0 , 0 , 1 , 150 , 0 ) "
    17 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0) should be [translateX(100px) rotate(90deg) translateX(100px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 100 ) " but got "matrix ( 1 , 0 , 0 , 1 , 200 , 0 ) "
    18 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0.25) should be [translateX(100px) rotate(90deg) translateX(125px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 125 ) " but got "matrix ( 1 , 0 , 0 , 1 , 225 , 0 ) "
    19 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0.5) should be [translateX(100px) rotate(90deg) translateX(150px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 150 ) " but got "matrix ( 1 , 0 , 0 , 1 , 250 , 0 ) "
    20 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0.75) should be [translateX(100px) rotate(90deg) translateX(175px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 175 ) " but got "matrix ( 1 , 0 , 0 , 1 , 275 , 0 ) "
    21 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (1) should be [translateX(100px) rotate(90deg) translateX(200px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 200 ) " but got "matrix ( 1 , 0 , 0 , 1 , 300 , 0 ) "
    22 FAIL Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (1.5) should be [translateX(100px) rotate(90deg) translateX(250px)] assert_equals: expected "matrix ( 0 , 1 , - 1 , 0 , 100 , 250 ) " but got "matrix ( 1 , 0 , 0 , 1 , 350 , 0 ) "
     16PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (-0.5) should be [translateX(100px) rotate(90deg) translateX(50px)]
     17PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0) should be [translateX(100px) rotate(90deg) translateX(100px)]
     18PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0.25) should be [translateX(100px) rotate(90deg) translateX(125px)]
     19PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0.5) should be [translateX(100px) rotate(90deg) translateX(150px)]
     20PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (0.75) should be [translateX(100px) rotate(90deg) translateX(175px)]
     21PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (1) should be [translateX(100px) rotate(90deg) translateX(200px)]
     22PASS Compositing: property <transform> underlying [translateX(100px) rotate(90deg)] from add [translateX(100px)] to add [translateX(200px)] at (1.5) should be [translateX(100px) rotate(90deg) translateX(250px)]
    2323PASS Compositing: property <transform> underlying [translateX(100px)] from accumulate [translateX(50px)] to accumulate [translateX(250px)] at (-0.5) should be [translateX(50px)]
    2424PASS Compositing: property <transform> underlying [translateX(100px)] from accumulate [translateX(50px)] to accumulate [translateX(250px)] at (0) should be [translateX(150px)]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt

    r285397 r285631  
    162162PASS transform: rotate
    163163PASS transform: scale
    164 FAIL transform: skew assert_approx_equals: expected matrix(1.064178, 0.540297, -0.401023, 0.898198, 0, 0) but got matrix(1, 0.57735, -0.36397, 1, 0, 0): The value should be matrix(1.064178, 0.540297, -0.401023, 0.898198, 0, 0) at 0ms but got matrix(1, 0.57735, -0.36397, 1, 0, 0) expected 1.064178 +/- 0.0001 but got 1
    165 FAIL transform: rotate on translate assert_approx_equals: expected matrix(0, 1, -1, 0, 100, 0) but got matrix(0, 1, -1, 0, 0, 0): The value should be matrix(0, 1, -1, 0, 100, 0) at 0ms but got matrix(0, 1, -1, 0, 0, 0) expected 100 +/- 0.0001 but got 0
    166 FAIL transform: translate on rotate assert_approx_equals: expected matrix(0, 1, -1, 0, 0, 100) but got matrix(1, 0, 0, 1, 100, 0): The value should be matrix(0, 1, -1, 0, 0, 100) at 0ms but got matrix(1, 0, 0, 1, 100, 0) expected 0 +/- 0.0001 but got 1
    167 FAIL transform: rotate on rotate and translate assert_approx_equals: expected matrix(0.707107, -0.707107, 0.707107, 0.707107, 70.710678, 70.710678) but got matrix(0.707107, -0.707107, 0.707107, 0.707107, 70.710678, -70.710678): The value should be matrix(0.707107, -0.707107, 0.707107, 0.707107, 70.710678, 70.710678) at 0ms but got matrix(0.707107, -0.707107, 0.707107, 0.707107, 70.710678, -70.710678) expected 70.710678 +/- 0.0001 but got -70.710678
    168 FAIL transform: matrix assert_approx_equals: expected matrix(0, 1, -1, 0, 0, 100) but got matrix(1, 0, 0, 1, 100, 0): The value should be matrix(0, 1, -1, 0, 0, 100) at 0ms but got matrix(1, 0, 0, 1, 100, 0) expected 0 +/- 0.0001 but got 1
     164PASS transform: skew
     165PASS transform: rotate on translate
     166PASS transform: translate on rotate
     167PASS transform: rotate on rotate and translate
     168PASS transform: matrix
    169169PASS transform: rotate3d
    170 FAIL transform: matrix3d assert_approx_equals: expected matrix3d(0.853553, 0.146447, 0.5, 0, 0.146447, 0.853553, -0.5, 0, -0.5, 0.5, 0.707107, 0, 0, 0, 0, 1) but got matrix3d(0.5, 0.5, 0.707107, 0, 0.5, 0.5, -0.707107, 0, -0.707107, 0.707107, 0, 0, 0, 0, 0, 1): The value should be matrix3d(0.853553, 0.146447, 0.5, 0, 0.146447, 0.853553, -0.5, 0, -0.5, 0.5, 0.707107, 0, 0, 0, 0, 1) at 0ms but got matrix3d(0.5, 0.5, 0.707107, 0, 0.5, 0.5, -0.707107, 0, -0.707107, 0.707107, 0, 0, 0, 0, 0, 1) expected 0.853553 +/- 0.0001 but got 0.5
    171 FAIL transform: non-invertible matrices assert_approx_equals: expected matrix(-1, 0, 0, -1, 250, 0) but got matrix(-1, 0, 0, -1, 200, 0): The value should be matrix(-1, 0, 0, -1, 250, 0) at 0ms but got matrix(-1, 0, 0, -1, 200, 0) expected 250 +/- 0.0001 but got 200
    172 FAIL transform: non-invertible matrices in matched transform lists assert_approx_equals: expected matrix(0, -1, 1, 0, 250, 0) but got matrix(0, -1, 1, 0, 200, 0): The value should be matrix(0, -1, 1, 0, 250, 0) at 0ms but got matrix(0, -1, 1, 0, 200, 0) expected 250 +/- 0.0001 but got 200
    173 FAIL transform: non-invertible matrices in mismatched transform lists assert_approx_equals: expected matrix(-2, 0, 0, -2, 250, 0) but got matrix(-2, 0, 0, -2, 200, 0): The value should be matrix(-2, 0, 0, -2, 250, 0) at 0ms but got matrix(-2, 0, 0, -2, 200, 0) expected 250 +/- 0.0001 but got 200
     170PASS transform: matrix3d
     171PASS transform: non-invertible matrices
     172PASS transform: non-invertible matrices in matched transform lists
     173PASS transform: non-invertible matrices in mismatched transform lists
    174174PASS transform-box (type: discrete) has testAddition function
    175175PASS transform-box: "border-box" onto "fill-box"

  • trunk/Source/WebCore/ChangeLog

    r285630 r285631  
     12021-11-11  Antoine Quint  <graouts@webkit.org>
     2
     3        Improve additivity support when animating the transform property
     4        https://bugs.webkit.org/show_bug.cgi?id=232990
     5
     6        Reviewed by Dean Jackson.
     7
     8        When blending TransformOperations with the "add" composite operation, we should
     9        simply concatenate the from and to transform operations.
     10
     11        * animation/CSSPropertyAnimation.cpp:
     12        (WebCore::blendFunc):
     13
    1142021-11-11  Antti Koivisto  <antti@apple.com>
    215

  • trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

    r285423 r285631  
    161161static inline TransformOperations blendFunc(const TransformOperations& from, const TransformOperations& to, const CSSPropertyBlendingContext& context)
    162162{
     163    if (context.compositeOperation == CompositeOperation::Add) {
     164        ASSERT(context.progress == 1.0);
     165        TransformOperations resultOperations;
     166        for (auto operation : from.operations())
     167            resultOperations.operations().append(operation);
     168        for (auto operation : to.operations())
     169            resultOperations.operations().append(operation);
     170        return resultOperations;
     171    }
     172
    163173    if (context.client->transformFunctionListsMatch())
    164174        return to.blendByMatchingOperations(from, context);
Note: See TracChangeset for help on using the changeset viewer.