Changeset 268718 in webkit


Ignore:
Timestamp:
Oct 20, 2020 2:19:23 AM (21 months ago)
Author:
svillar@igalia.com
Message:

[css-flexbox] flex-shrink property should be animatable
​https://bugs.webkit.org/show_bug.cgi?id=209874

Reviewed by Manuel Rego Casasnovas.

LayoutTests/imported/w3c:

Added new expectations. Replaced ~100 FAIL subtests with PASS expectations.

  • web-platform-tests/css/css-flexbox/animation/flex-shrink-interpolation-expected.txt:
  • web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
  • web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
  • web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:

Source/WebCore:

Make flew-shrink animatable as per spec. Also clamp its minimum value to 0 as it cannot be a negative number.

This allows us to pass a bunch of flexbox animation subtests.

  • animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap): Mark flex-shrink as animatable.

  • rendering/style/RenderStyle.h:

(WebCore::RenderStyle::setFlexShrink): Clamp minimum value to 0.

LayoutTests:

Removed GTK's and WPE's platform expectations for some web-animation tests as both ports could make use of the cross platform ones.

  • platform/gtk/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-expected.txt: Removed.
  • platform/gtk/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-expected.txt: Removed.
  • platform/wpe/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-expected.txt: Removed.
  • platform/wpe/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-expected.txt: Removed.
Location:
trunk
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r268716 r268718  
     12020-10-19  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [css-flexbox] flex-shrink property should be animatable
     4        https://bugs.webkit.org/show_bug.cgi?id=209874
     5
     6        Reviewed by Manuel Rego Casasnovas.
     7
     8        Removed GTK's and WPE's platform expectations for some web-animation tests as both ports could make use of the cross platform ones.
     9
     10        * platform/gtk/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-expected.txt: Removed.
     11        * platform/gtk/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-expected.txt: Removed.
     12        * platform/wpe/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-expected.txt: Removed.
     13        * platform/wpe/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-expected.txt: Removed.
     14
    1152020-10-20  Philippe Normand  <pnormand@igalia.com> and Pavel Feldman <pavel.feldman@gmail.com>
    216

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r268713 r268718  
     12020-10-19  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [css-flexbox] flex-shrink property should be animatable
     4        https://bugs.webkit.org/show_bug.cgi?id=209874
     5
     6        Reviewed by Manuel Rego Casasnovas.
     7
     8        Added new expectations. Replaced ~100 FAIL subtests with PASS expectations.
     9
     10        * web-platform-tests/css/css-flexbox/animation/flex-shrink-interpolation-expected.txt:
     11        * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
     12        * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
     13        * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:
     14
    1152020-10-19  Sihui Liu  <sihui_liu@apple.com>
    216

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/animation/flex-shrink-interpolation-expected.txt

    r267650 r268718  
    11
    2 FAIL CSS Transitions: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35] assert_equals: expected "1.35 " but got "2 "
    3 FAIL CSS Transitions: property <flex-shrink> from neutral to [2] at (0) should be [1.5] assert_equals: expected "1.5 " but got "2 "
    4 FAIL CSS Transitions: property <flex-shrink> from neutral to [2] at (0.3) should be [1.65] assert_equals: expected "1.65 " but got "2 "
    5 FAIL CSS Transitions: property <flex-shrink> from neutral to [2] at (0.6) should be [1.8] assert_equals: expected "1.8 " but got "2 "
     2PASS CSS Transitions: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35]
     3PASS CSS Transitions: property <flex-shrink> from neutral to [2] at (0) should be [1.5]
     4PASS CSS Transitions: property <flex-shrink> from neutral to [2] at (0.3) should be [1.65]
     5PASS CSS Transitions: property <flex-shrink> from neutral to [2] at (0.6) should be [1.8]
    66PASS CSS Transitions: property <flex-shrink> from neutral to [2] at (1) should be [2]
    7 FAIL CSS Transitions: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25] assert_equals: expected "2.25 " but got "2 "
     7PASS CSS Transitions: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25]
    88PASS CSS Transitions with transition: all: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35]
    99PASS CSS Transitions with transition: all: property <flex-shrink> from neutral to [2] at (0) should be [1.5]
    … …  
    1212PASS CSS Transitions with transition: all: property <flex-shrink> from neutral to [2] at (1) should be [2]
    1313PASS CSS Transitions with transition: all: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25]
    14 FAIL CSS Animations: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35] assert_equals: expected "1.35 " but got "1.5 "
     14PASS CSS Animations: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35]
    1515PASS CSS Animations: property <flex-shrink> from neutral to [2] at (0) should be [1.5]
    16 FAIL CSS Animations: property <flex-shrink> from neutral to [2] at (0.3) should be [1.65] assert_equals: expected "1.65 " but got "1.5 "
    17 FAIL CSS Animations: property <flex-shrink> from neutral to [2] at (0.6) should be [1.8] assert_equals: expected "1.8 " but got "1.5 "
    18 FAIL CSS Animations: property <flex-shrink> from neutral to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    19 FAIL CSS Animations: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25] assert_equals: expected "2.25 " but got "1.5 "
    20 FAIL Web Animations: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35] assert_equals: expected "1.35 " but got "1.5 "
    21 PASS Web Animations: property <flex-shrink> from neutral to [2] at (0) should be [1.5]
    22 FAIL Web Animations: property <flex-shrink> from neutral to [2] at (0.3) should be [1.65] assert_equals: expected "1.65 " but got "1.5 "
    23 FAIL Web Animations: property <flex-shrink> from neutral to [2] at (0.6) should be [1.8] assert_equals: expected "1.8 " but got "1.5 "
    24 FAIL Web Animations: property <flex-shrink> from neutral to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    25 FAIL Web Animations: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25] assert_equals: expected "2.25 " but got "1.5 "
    26 FAIL CSS Transitions: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "2 "
    27 FAIL CSS Transitions: property <flex-shrink> from [initial] to [2] at (0) should be [1] assert_equals: expected "1 " but got "2 "
    28 FAIL CSS Transitions: property <flex-shrink> from [initial] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "2 "
    29 FAIL CSS Transitions: property <flex-shrink> from [initial] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "2 "
     16PASS CSS Animations: property <flex-shrink> from neutral to [2] at (0.3) should be [1.65]
     17PASS CSS Animations: property <flex-shrink> from neutral to [2] at (0.6) should be [1.8]
     18PASS CSS Animations: property <flex-shrink> from neutral to [2] at (1) should be [2]
     19PASS CSS Animations: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25]
     20PASS Web Animations: property <flex-shrink> from neutral to [2] at (-0.3) should be [1.35]
     21FAIL Web Animations: property <flex-shrink> from neutral to [2] at (0) should be [1.5] assert_equals: expected "1.5 " but got "1.35 "
     22FAIL Web Animations: property <flex-shrink> from neutral to [2] at (0.3) should be [1.65] assert_equals: expected "1.65 " but got "1.55 "
     23FAIL Web Animations: property <flex-shrink> from neutral to [2] at (0.6) should be [1.8] assert_equals: expected "1.8 " but got "1.82 "
     24PASS Web Animations: property <flex-shrink> from neutral to [2] at (1) should be [2]
     25FAIL Web Animations: property <flex-shrink> from neutral to [2] at (1.5) should be [2.25] assert_equals: expected "2.25 " but got "2 "
     26PASS CSS Transitions: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7]
     27PASS CSS Transitions: property <flex-shrink> from [initial] to [2] at (0) should be [1]
     28PASS CSS Transitions: property <flex-shrink> from [initial] to [2] at (0.3) should be [1.3]
     29PASS CSS Transitions: property <flex-shrink> from [initial] to [2] at (0.6) should be [1.6]
    3030PASS CSS Transitions: property <flex-shrink> from [initial] to [2] at (1) should be [2]
    31 FAIL CSS Transitions: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "2 "
     31PASS CSS Transitions: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5]
    3232PASS CSS Transitions with transition: all: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7]
    3333PASS CSS Transitions with transition: all: property <flex-shrink> from [initial] to [2] at (0) should be [1]
    … …  
    3636PASS CSS Transitions with transition: all: property <flex-shrink> from [initial] to [2] at (1) should be [2]
    3737PASS CSS Transitions with transition: all: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5]
    38 FAIL CSS Animations: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "1.5 "
    39 FAIL CSS Animations: property <flex-shrink> from [initial] to [2] at (0) should be [1] assert_equals: expected "1 " but got "1.5 "
    40 FAIL CSS Animations: property <flex-shrink> from [initial] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "1.5 "
    41 FAIL CSS Animations: property <flex-shrink> from [initial] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "1.5 "
    42 FAIL CSS Animations: property <flex-shrink> from [initial] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    43 FAIL CSS Animations: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "1.5 "
    44 FAIL Web Animations: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "1.5 "
    45 FAIL Web Animations: property <flex-shrink> from [initial] to [2] at (0) should be [1] assert_equals: expected "1 " but got "1.5 "
    46 FAIL Web Animations: property <flex-shrink> from [initial] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "1.5 "
    47 FAIL Web Animations: property <flex-shrink> from [initial] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "1.5 "
    48 FAIL Web Animations: property <flex-shrink> from [initial] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    49 FAIL Web Animations: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "1.5 "
    50 FAIL CSS Transitions: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3] assert_equals: expected "3.3 " but got "2 "
    51 FAIL CSS Transitions: property <flex-shrink> from [inherit] to [2] at (0) should be [3] assert_equals: expected "3 " but got "2 "
    52 FAIL CSS Transitions: property <flex-shrink> from [inherit] to [2] at (0.3) should be [2.7] assert_equals: expected "2.7 " but got "2 "
    53 FAIL CSS Transitions: property <flex-shrink> from [inherit] to [2] at (0.6) should be [2.4] assert_equals: expected "2.4 " but got "2 "
     38PASS CSS Animations: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7]
     39PASS CSS Animations: property <flex-shrink> from [initial] to [2] at (0) should be [1]
     40PASS CSS Animations: property <flex-shrink> from [initial] to [2] at (0.3) should be [1.3]
     41PASS CSS Animations: property <flex-shrink> from [initial] to [2] at (0.6) should be [1.6]
     42PASS CSS Animations: property <flex-shrink> from [initial] to [2] at (1) should be [2]
     43PASS CSS Animations: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5]
     44PASS Web Animations: property <flex-shrink> from [initial] to [2] at (-0.3) should be [0.7]
     45PASS Web Animations: property <flex-shrink> from [initial] to [2] at (0) should be [1]
     46PASS Web Animations: property <flex-shrink> from [initial] to [2] at (0.3) should be [1.3]
     47PASS Web Animations: property <flex-shrink> from [initial] to [2] at (0.6) should be [1.6]
     48PASS Web Animations: property <flex-shrink> from [initial] to [2] at (1) should be [2]
     49PASS Web Animations: property <flex-shrink> from [initial] to [2] at (1.5) should be [2.5]
     50PASS CSS Transitions: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3]
     51PASS CSS Transitions: property <flex-shrink> from [inherit] to [2] at (0) should be [3]
     52PASS CSS Transitions: property <flex-shrink> from [inherit] to [2] at (0.3) should be [2.7]
     53PASS CSS Transitions: property <flex-shrink> from [inherit] to [2] at (0.6) should be [2.4]
    5454PASS CSS Transitions: property <flex-shrink> from [inherit] to [2] at (1) should be [2]
    55 FAIL CSS Transitions: property <flex-shrink> from [inherit] to [2] at (1.5) should be [1.5] assert_equals: expected "1.5 " but got "2 "
     55PASS CSS Transitions: property <flex-shrink> from [inherit] to [2] at (1.5) should be [1.5]
    5656PASS CSS Transitions with transition: all: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3]
    5757PASS CSS Transitions with transition: all: property <flex-shrink> from [inherit] to [2] at (0) should be [3]
    … …  
    6060PASS CSS Transitions with transition: all: property <flex-shrink> from [inherit] to [2] at (1) should be [2]
    6161PASS CSS Transitions with transition: all: property <flex-shrink> from [inherit] to [2] at (1.5) should be [1.5]
    62 FAIL CSS Animations: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3] assert_equals: expected "3.3 " but got "1.5 "
    63 FAIL CSS Animations: property <flex-shrink> from [inherit] to [2] at (0) should be [3] assert_equals: expected "3 " but got "1.5 "
    64 FAIL CSS Animations: property <flex-shrink> from [inherit] to [2] at (0.3) should be [2.7] assert_equals: expected "2.7 " but got "1.5 "
    65 FAIL CSS Animations: property <flex-shrink> from [inherit] to [2] at (0.6) should be [2.4] assert_equals: expected "2.4 " but got "1.5 "
    66 FAIL CSS Animations: property <flex-shrink> from [inherit] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
     62PASS CSS Animations: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3]
     63PASS CSS Animations: property <flex-shrink> from [inherit] to [2] at (0) should be [3]
     64PASS CSS Animations: property <flex-shrink> from [inherit] to [2] at (0.3) should be [2.7]
     65PASS CSS Animations: property <flex-shrink> from [inherit] to [2] at (0.6) should be [2.4]
     66PASS CSS Animations: property <flex-shrink> from [inherit] to [2] at (1) should be [2]
    6767PASS CSS Animations: property <flex-shrink> from [inherit] to [2] at (1.5) should be [1.5]
    68 FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3] assert_equals: expected "3.3 " but got "1.5 "
    69 FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (0) should be [3] assert_equals: expected "3 " but got "1.5 "
    70 FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (0.3) should be [2.7] assert_equals: expected "2.7 " but got "1.5 "
    71 FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (0.6) should be [2.4] assert_equals: expected "2.4 " but got "1.5 "
    72 FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    73 PASS Web Animations: property <flex-shrink> from [inherit] to [2] at (1.5) should be [1.5]
    74 FAIL CSS Transitions: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "2 "
    75 FAIL CSS Transitions: property <flex-shrink> from [unset] to [2] at (0) should be [1] assert_equals: expected "1 " but got "2 "
    76 FAIL CSS Transitions: property <flex-shrink> from [unset] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "2 "
    77 FAIL CSS Transitions: property <flex-shrink> from [unset] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "2 "
     68FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (-0.3) should be [3.3] assert_equals: expected "3.3 " but got "1.35 "
     69FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (0) should be [3] assert_equals: expected "3 " but got "1.35 "
     70FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (0.3) should be [2.7] assert_equals: expected "2.7 " but got "1.55 "
     71FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (0.6) should be [2.4] assert_equals: expected "2.4 " but got "1.82 "
     72PASS Web Animations: property <flex-shrink> from [inherit] to [2] at (1) should be [2]
     73FAIL Web Animations: property <flex-shrink> from [inherit] to [2] at (1.5) should be [1.5] assert_equals: expected "1.5 " but got "2 "
     74PASS CSS Transitions: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7]
     75PASS CSS Transitions: property <flex-shrink> from [unset] to [2] at (0) should be [1]
     76PASS CSS Transitions: property <flex-shrink> from [unset] to [2] at (0.3) should be [1.3]
     77PASS CSS Transitions: property <flex-shrink> from [unset] to [2] at (0.6) should be [1.6]
    7878PASS CSS Transitions: property <flex-shrink> from [unset] to [2] at (1) should be [2]
    79 FAIL CSS Transitions: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "2 "
     79PASS CSS Transitions: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5]
    8080PASS CSS Transitions with transition: all: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7]
    8181PASS CSS Transitions with transition: all: property <flex-shrink> from [unset] to [2] at (0) should be [1]
    … …  
    8484PASS CSS Transitions with transition: all: property <flex-shrink> from [unset] to [2] at (1) should be [2]
    8585PASS CSS Transitions with transition: all: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5]
    86 FAIL CSS Animations: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "1.5 "
    87 FAIL CSS Animations: property <flex-shrink> from [unset] to [2] at (0) should be [1] assert_equals: expected "1 " but got "1.5 "
    88 FAIL CSS Animations: property <flex-shrink> from [unset] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "1.5 "
    89 FAIL CSS Animations: property <flex-shrink> from [unset] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "1.5 "
    90 FAIL CSS Animations: property <flex-shrink> from [unset] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    91 FAIL CSS Animations: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "1.5 "
    92 FAIL Web Animations: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "1.5 "
    93 FAIL Web Animations: property <flex-shrink> from [unset] to [2] at (0) should be [1] assert_equals: expected "1 " but got "1.5 "
    94 FAIL Web Animations: property <flex-shrink> from [unset] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "1.5 "
    95 FAIL Web Animations: property <flex-shrink> from [unset] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "1.5 "
    96 FAIL Web Animations: property <flex-shrink> from [unset] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    97 FAIL Web Animations: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "1.5 "
    98 FAIL CSS Transitions: property <flex-shrink> from [1] to [2] at (-5) should be [0] assert_equals: expected "0 " but got "2 "
    99 FAIL CSS Transitions: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "2 "
    100 FAIL CSS Transitions: property <flex-shrink> from [1] to [2] at (0) should be [1] assert_equals: expected "1 " but got "2 "
    101 FAIL CSS Transitions: property <flex-shrink> from [1] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "2 "
    102 FAIL CSS Transitions: property <flex-shrink> from [1] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "2 "
     86PASS CSS Animations: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7]
     87PASS CSS Animations: property <flex-shrink> from [unset] to [2] at (0) should be [1]
     88PASS CSS Animations: property <flex-shrink> from [unset] to [2] at (0.3) should be [1.3]
     89PASS CSS Animations: property <flex-shrink> from [unset] to [2] at (0.6) should be [1.6]
     90PASS CSS Animations: property <flex-shrink> from [unset] to [2] at (1) should be [2]
     91PASS CSS Animations: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5]
     92PASS Web Animations: property <flex-shrink> from [unset] to [2] at (-0.3) should be [0.7]
     93PASS Web Animations: property <flex-shrink> from [unset] to [2] at (0) should be [1]
     94PASS Web Animations: property <flex-shrink> from [unset] to [2] at (0.3) should be [1.3]
     95PASS Web Animations: property <flex-shrink> from [unset] to [2] at (0.6) should be [1.6]
     96PASS Web Animations: property <flex-shrink> from [unset] to [2] at (1) should be [2]
     97PASS Web Animations: property <flex-shrink> from [unset] to [2] at (1.5) should be [2.5]
     98PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (-5) should be [0]
     99PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7]
     100PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (0) should be [1]
     101PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (0.3) should be [1.3]
     102PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (0.6) should be [1.6]
    103103PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (1) should be [2]
    104 FAIL CSS Transitions: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "2 "
    105 FAIL CSS Transitions with transition: all: property <flex-shrink> from [1] to [2] at (-5) should be [0] assert_equals: expected "0 " but got "- 4 "
     104PASS CSS Transitions: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5]
     105PASS CSS Transitions with transition: all: property <flex-shrink> from [1] to [2] at (-5) should be [0]
    106106PASS CSS Transitions with transition: all: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7]
    107107PASS CSS Transitions with transition: all: property <flex-shrink> from [1] to [2] at (0) should be [1]
    … …  
    110110PASS CSS Transitions with transition: all: property <flex-shrink> from [1] to [2] at (1) should be [2]
    111111PASS CSS Transitions with transition: all: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5]
    112 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (-5) should be [0] assert_equals: expected "0 " but got "1.5 "
    113 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "1.5 "
    114 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (0) should be [1] assert_equals: expected "1 " but got "1.5 "
    115 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "1.5 "
    116 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "1.5 "
    117 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    118 FAIL CSS Animations: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "1.5 "
    119 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (-5) should be [0] assert_equals: expected "0 " but got "1.5 "
    120 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7] assert_equals: expected "0.7 " but got "1.5 "
    121 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (0) should be [1] assert_equals: expected "1 " but got "1.5 "
    122 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (0.3) should be [1.3] assert_equals: expected "1.3 " but got "1.5 "
    123 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (0.6) should be [1.6] assert_equals: expected "1.6 " but got "1.5 "
    124 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (1) should be [2] assert_equals: expected "2 " but got "1.5 "
    125 FAIL Web Animations: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5] assert_equals: expected "2.5 " but got "1.5 "
    126 FAIL CSS Transitions: property <flex-shrink> from [0] to [1] at (-5) should be [0] assert_equals: expected "0 " but got "1 "
    127 FAIL CSS Transitions: property <flex-shrink> from [0] to [1] at (-0.3) should be [0] assert_equals: expected "0 " but got "1 "
    128 FAIL CSS Transitions: property <flex-shrink> from [0] to [1] at (0) should be [0] assert_equals: expected "0 " but got "1 "
    129 FAIL CSS Transitions: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3] assert_equals: expected "0.3 " but got "1 "
    130 FAIL CSS Transitions: property <flex-shrink> from [0] to [1] at (0.6) should be [0.6] assert_equals: expected "0.6 " but got "1 "
     112PASS CSS Animations: property <flex-shrink> from [1] to [2] at (-5) should be [0]
     113PASS CSS Animations: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7]
     114PASS CSS Animations: property <flex-shrink> from [1] to [2] at (0) should be [1]
     115PASS CSS Animations: property <flex-shrink> from [1] to [2] at (0.3) should be [1.3]
     116PASS CSS Animations: property <flex-shrink> from [1] to [2] at (0.6) should be [1.6]
     117PASS CSS Animations: property <flex-shrink> from [1] to [2] at (1) should be [2]
     118PASS CSS Animations: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5]
     119PASS Web Animations: property <flex-shrink> from [1] to [2] at (-5) should be [0]
     120PASS Web Animations: property <flex-shrink> from [1] to [2] at (-0.3) should be [0.7]
     121PASS Web Animations: property <flex-shrink> from [1] to [2] at (0) should be [1]
     122PASS Web Animations: property <flex-shrink> from [1] to [2] at (0.3) should be [1.3]
     123PASS Web Animations: property <flex-shrink> from [1] to [2] at (0.6) should be [1.6]
     124PASS Web Animations: property <flex-shrink> from [1] to [2] at (1) should be [2]
     125PASS Web Animations: property <flex-shrink> from [1] to [2] at (1.5) should be [2.5]
     126PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (-5) should be [0]
     127PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (-0.3) should be [0]
     128PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (0) should be [0]
     129PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3]
     130PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (0.6) should be [0.6]
    131131PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (1) should be [1]
    132 FAIL CSS Transitions: property <flex-shrink> from [0] to [1] at (1.5) should be [1.5] assert_equals: expected "1.5 " but got "1 "
    133 FAIL CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (-5) should be [0] assert_equals: expected "0 " but got "- 5 "
    134 FAIL CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (-0.3) should be [0] assert_equals: expected "0 " but got "- 0.3 "
     132PASS CSS Transitions: property <flex-shrink> from [0] to [1] at (1.5) should be [1.5]
     133PASS CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (-5) should be [0]
     134PASS CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (-0.3) should be [0]
    135135PASS CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (0) should be [0]
    136136PASS CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3]
    … …  
    138138PASS CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (1) should be [1]
    139139PASS CSS Transitions with transition: all: property <flex-shrink> from [0] to [1] at (1.5) should be [1.5]
    140 FAIL CSS Animations: property <flex-shrink> from [0] to [1] at (-5) should be [0] assert_equals: expected "0 " but got "1.5 "
    141 FAIL CSS Animations: property <flex-shrink> from [0] to [1] at (-0.3) should be [0] assert_equals: expected "0 " but got "1.5 "
    142 FAIL CSS Animations: property <flex-shrink> from [0] to [1] at (0) should be [0] assert_equals: expected "0 " but got "1.5 "
    143 FAIL CSS Animations: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3] assert_equals: expected "0.3 " but got "1.5 "
    144 FAIL CSS Animations: property <flex-shrink> from [0] to [1] at (0.6) should be [0.6] assert_equals: expected "0.6 " but got "1.5 "
    145 FAIL CSS Animations: property <flex-shrink> from [0] to [1] at (1) should be [1] assert_equals: expected "1 " but got "1.5 "
     140PASS CSS Animations: property <flex-shrink> from [0] to [1] at (-5) should be [0]
     141PASS CSS Animations: property <flex-shrink> from [0] to [1] at (-0.3) should be [0]
     142PASS CSS Animations: property <flex-shrink> from [0] to [1] at (0) should be [0]
     143PASS CSS Animations: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3]
     144PASS CSS Animations: property <flex-shrink> from [0] to [1] at (0.6) should be [0.6]
     145PASS CSS Animations: property <flex-shrink> from [0] to [1] at (1) should be [1]
    146146PASS CSS Animations: property <flex-shrink> from [0] to [1] at (1.5) should be [1.5]
    147 FAIL Web Animations: property <flex-shrink> from [0] to [1] at (-5) should be [0] assert_equals: expected "0 " but got "1.5 "
    148 FAIL Web Animations: property <flex-shrink> from [0] to [1] at (-0.3) should be [0] assert_equals: expected "0 " but got "1.5 "
    149 FAIL Web Animations: property <flex-shrink> from [0] to [1] at (0) should be [0] assert_equals: expected "0 " but got "1.5 "
    150 FAIL Web Animations: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3] assert_equals: expected "0.3 " but got "1.5 "
    151 FAIL Web Animations: property <flex-shrink> from [0] to [1] at (0.6) should be [0.6] assert_equals: expected "0.6 " but got "1.5 "
    152 FAIL Web Animations: property <flex-shrink> from [0] to [1] at (1) should be [1] assert_equals: expected "1 " but got "1.5 "
     147PASS Web Animations: property <flex-shrink> from [0] to [1] at (-5) should be [0]
     148PASS Web Animations: property <flex-shrink> from [0] to [1] at (-0.3) should be [0]
     149PASS Web Animations: property <flex-shrink> from [0] to [1] at (0) should be [0]
     150PASS Web Animations: property <flex-shrink> from [0] to [1] at (0.3) should be [0.3]
     151PASS Web Animations: property <flex-shrink> from [0] to [1] at (0.6) should be [0.6]
     152PASS Web Animations: property <flex-shrink> from [0] to [1] at (1) should be [1]
    153153PASS Web Animations: property <flex-shrink> from [0] to [1] at (1.5) should be [1.5]
    154154

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

    r268516 r268718  
    115115PASS flex-grow (type: positiveNumber) has testAccumulation function
    116116FAIL flex-grow: positive number assert_equals: The value should be 2.2 at 0ms expected "2.2" but got "1.100000023841858"
     117PASS flex-shrink (type: positiveNumber) has testAccumulation function
     118FAIL flex-shrink: positive number assert_equals: The value should be 2.2 at 0ms expected "2.2" but got "1.100000023841858"
    117119PASS flood-color (type: color) has testAccumulation function
    118120FAIL flood-color supports animating as color of rgb() with overflowed  from and to values assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"

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

    r268516 r268718  
    115115PASS flex-grow (type: positiveNumber) has testAddition function
    116116FAIL flex-grow: positive number assert_equals: The value should be 2.2 at 0ms expected "2.2" but got "1.100000023841858"
     117PASS flex-shrink (type: positiveNumber) has testAddition function
     118FAIL flex-shrink: positive number assert_equals: The value should be 2.2 at 0ms expected "2.2" but got "1.100000023841858"
    117119PASS flood-color (type: color) has testAddition function
    118120FAIL flood-color supports animating as color of rgb() with overflowed  from and to values assert_equals: The value should be rgb(255, 128, 128) at 0ms expected "rgb(255, 128, 128)" but got "rgb(255, 0, 0)"

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

    r268516 r268718  
    136136PASS flex-grow (type: positiveNumber) has testInterpolation function
    137137FAIL flex-grow supports animating as a positive number assert_equals: The value should be 1.3 at 500ms expected "1.3" but got "1.2999999523162842"
     138PASS flex-shrink (type: positiveNumber) has testInterpolation function
     139FAIL flex-shrink supports animating as a positive number assert_equals: The value should be 1.3 at 500ms expected "1.3" but got "1.2999999523162842"
    138140PASS flood-color (type: color) has testInterpolation function
    139141PASS flood-color supports animating as color of rgb()

  • trunk/Source/WebCore/ChangeLog

    r268716 r268718  
     12020-10-19  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [css-flexbox] flex-shrink property should be animatable
     4        https://bugs.webkit.org/show_bug.cgi?id=209874
     5
     6        Reviewed by Manuel Rego Casasnovas.
     7
     8        Make flew-shrink animatable as per spec. Also clamp its minimum value to 0 as it cannot be a negative number.
     9
     10        This allows us to pass a bunch of flexbox animation subtests.
     11
     12        * animation/CSSPropertyAnimation.cpp:
     13        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap): Mark flex-shrink as animatable.
     14        * rendering/style/RenderStyle.h:
     15        (WebCore::RenderStyle::setFlexShrink): Clamp minimum value to 0.
     16
    1172020-10-20  Philippe Normand  <pnormand@igalia.com> and Pavel Feldman <pavel.feldman@gmail.com>
    218

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

    r268615 r268718  
    18721872
    18731873        new PropertyWrapper<float>(CSSPropertyFlexGrow, &RenderStyle::flexGrow, &RenderStyle::setFlexGrow),
     1874        new PropertyWrapper<float>(CSSPropertyFlexShrink, &RenderStyle::flexShrink, &RenderStyle::setFlexShrink),
    18741875    };
    18751876    const unsigned animatableLonghandPropertiesCount = WTF_ARRAY_LENGTH(animatableLonghandPropertyWrappers);

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r268516 r268718  
    11031103    void setBoxSizing(BoxSizing s) { SET_VAR(m_boxData, m_boxSizing, static_cast<unsigned>(s)); }
    11041104    void setFlexGrow(float f) { float clampedGrow = std::max<float>(f, 0.f); SET_NESTED_VAR(m_rareNonInheritedData, flexibleBox, flexGrow, clampedGrow); }
    1105     void setFlexShrink(float f) { SET_NESTED_VAR(m_rareNonInheritedData, flexibleBox, flexShrink, f); }
     1105    void setFlexShrink(float f) { float clampledShrink = std::max<float>(f, 0.f); SET_NESTED_VAR(m_rareNonInheritedData, flexibleBox, flexShrink, clampledShrink); }
    11061106    void setFlexBasis(Length&& length) { SET_NESTED_VAR(m_rareNonInheritedData, flexibleBox, flexBasis, WTFMove(length)); }
    11071107    void setOrder(int o) { SET_VAR(m_rareNonInheritedData, order, o); }
Note: See TracChangeset for help on using the changeset viewer.