commit 382ceaa59195161d14c4d9ea8c5d446276285fc8 parent 33bcda73e006193dd30bc4668f6dcc7164ecce87 Author: Cristina Horotan <chorotan@mozilla.com> Date: Mon, 12 Jan 2026 02:16:18 +0200 Revert "Bug 1957751 - Annotate some more passes." for causing chrome failures on test_moz_button.html This reverts commit 4b2c9698ccbd4c5523f2e16ab99e28a2b2a69916. Revert "Bug 1957751 - Serialize background-size and mask-size as two values. r=firefox-style-system-reviewers,emilio" This reverts commit 123a6b978c196a5b2df2544f4007cad9f6cb9227. Diffstat:
9 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/servo/components/style/values/generics/background.rs b/servo/components/style/values/generics/background.rs @@ -31,7 +31,7 @@ pub enum GenericBackgroundSize<LengthPercent> { /// Explicit width. width: GenericLengthPercentageOrAuto<LengthPercent>, /// Explicit height. - #[css(contextual_skip_if = "width_and_height_are_auto")] + #[css(skip_if = "GenericLengthPercentageOrAuto::is_auto")] height: GenericLengthPercentageOrAuto<LengthPercent>, }, /// `cover` @@ -42,11 +42,6 @@ pub enum GenericBackgroundSize<LengthPercent> { Contain, } -#[inline] -fn width_and_height_are_auto<LengthPercent>(width: &GenericLengthPercentageOrAuto<LengthPercent>, height: &GenericLengthPercentageOrAuto<LengthPercent>) -> bool { - width.is_auto() && height.is_auto() -} - pub use self::GenericBackgroundSize as BackgroundSize; impl<LengthPercentage> BackgroundSize<LengthPercentage> { diff --git a/testing/web-platform/meta/css/css-backgrounds/background-332.html.ini b/testing/web-platform/meta/css/css-backgrounds/background-332.html.ini @@ -0,0 +1,3 @@ +[background-332.html] + [background_specified_size] + expected: FAIL diff --git a/testing/web-platform/meta/css/css-backgrounds/background-size-001.html.ini b/testing/web-platform/meta/css/css-backgrounds/background-size-001.html.ini @@ -0,0 +1,29 @@ +[background-size-001.html] + expected: + if (os == "android") and fission: [OK, TIMEOUT] + [background-size_length_zero] + expected: FAIL + + [background-size_length_negative_zero] + expected: FAIL + + [background-size_length_positive_zero] + expected: FAIL + + [background-size_length_normal] + expected: FAIL + + [background-size_percentage_min] + expected: FAIL + + [background-size_percentage_normal] + expected: FAIL + + [background-size_percentage_max] + expected: FAIL + + [background-size_length_auto] + expected: FAIL + + [background-size_percentage_auto] + expected: FAIL diff --git a/testing/web-platform/meta/css/css-backgrounds/parsing/background-shorthand-serialization.html.ini b/testing/web-platform/meta/css/css-backgrounds/parsing/background-shorthand-serialization.html.ini @@ -1,4 +1,7 @@ [background-shorthand-serialization.html] + [background-size with non-initial background-position] + expected: FAIL + [multiple backgrounds with varying values] expected: FAIL diff --git a/testing/web-platform/meta/css/css-backgrounds/parsing/background-size-computed.html.ini b/testing/web-platform/meta/css/css-backgrounds/parsing/background-size-computed.html.ini @@ -3,3 +3,9 @@ if (os == "android") and fission: [OK, TIMEOUT] [Property background-size value 'auto 1px, 2% 3%, contain'] expected: FAIL + + [Property background-size value '1px'] + expected: FAIL + + [Property background-size value '1px auto'] + expected: FAIL diff --git a/testing/web-platform/meta/css/css-masking/parsing/mask-size-computed.html.ini b/testing/web-platform/meta/css/css-masking/parsing/mask-size-computed.html.ini @@ -1,3 +1,15 @@ [mask-size-computed.html] + [Property mask-size value '1px'] + expected: FAIL + + [Property mask-size value '1px auto'] + expected: FAIL + [Property mask-size value 'auto 1px, 2% 3%, contain'] expected: FAIL + + [Property mask-size value 'auto, 100%' multiple values] + expected: FAIL + + [Property mask-size value '100%' multiple values] + expected: FAIL diff --git a/testing/web-platform/meta/css/css-masking/parsing/mask-size-valid.html.ini b/testing/web-platform/meta/css/css-masking/parsing/mask-size-valid.html.ini @@ -0,0 +1,3 @@ +[mask-size-valid.html] + [e.style['mask-size'\] = "1px auto" should set the property value] + expected: FAIL diff --git a/testing/web-platform/tests/css/css-backgrounds/parsing/background-size-valid.html b/testing/web-platform/tests/css/css-backgrounds/parsing/background-size-valid.html @@ -12,11 +12,11 @@ </head> <body> <script> -test_valid_value("background-size", "1px", "1px auto"); -test_valid_value("background-size", "1px auto", "1px auto"); +test_valid_value("background-size", "1px", ["1px", "1px auto"]); +test_valid_value("background-size", "1px auto", ["1px", "1px auto"]); test_valid_value("background-size", "2% 3%"); -test_valid_value("background-size", "auto"); -test_valid_value("background-size", "auto auto", "auto"); +test_valid_value("background-size", "auto", ["auto", "auto auto"]); +test_valid_value("background-size", "auto auto", ["auto", "auto auto"]); test_valid_value("background-size", "auto 4%"); test_valid_value("background-size", "contain"); test_valid_value("background-size", "cover"); diff --git a/testing/web-platform/tests/css/css-masking/parsing/mask-size-valid.html b/testing/web-platform/tests/css/css-masking/parsing/mask-size-valid.html @@ -12,7 +12,7 @@ </head> <body> <script> -test_valid_value("mask-size", "1px", "1px auto"); +test_valid_value("mask-size", "1px"); test_valid_value("mask-size", "1px auto"); test_valid_value("mask-size", "2% 3%"); test_valid_value("mask-size", "auto");