From a772ecf786bda74cd5202b9ca6fb2d487cc61b94 Mon Sep 17 00:00:00 2001 From: Munish Mummadi <141582088+MunishMummadi@users.noreply.github.com> Date: Thu, 23 May 2024 00:18:46 -0500 Subject: [PATCH] Uprade stylo to include servo/style#33 (#32147) This adds support for text decoration color and style. --- Cargo.lock | 26 +++++++++---------- .../target-text-text-decoration-001.html.ini | 2 ++ .../parsing/text-decoration-computed.html.ini | 25 ------------------ .../parsing/text-decoration-valid.html.ini | 19 -------------- .../text-decoration-line-recalc.html.ini | 2 -- ...ecoration-serialization.tentative.html.ini | 4 --- .../text-decoration-shorthands-001.html.ini | 2 ++ .../text-decoration-shorthands-002.html.ini | 2 ++ .../text-decoration-skip-ink-003.html.ini | 2 -- .../target-text-text-decoration-001.html.ini | 2 ++ .../parsing/text-decoration-computed.html.ini | 25 ------------------ .../parsing/text-decoration-valid.html.ini | 19 -------------- .../text-decoration-dotted-002.html.ini | 2 ++ .../text-decoration-line-recalc.html.ini | 2 -- ...ecoration-serialization.tentative.html.ini | 4 --- .../text-decoration-shorthands-001.html.ini | 2 ++ .../text-decoration-shorthands-002.html.ini | 2 ++ .../text-decoration-style-multiple.html.ini | 2 ++ .../text-decoration-subelements-003.html.ini | 2 ++ .../variable-reference-visited.html.ini | 2 -- 20 files changed, 31 insertions(+), 117 deletions(-) create mode 100644 tests/wpt/meta-legacy-layout/css/css-pseudo/target-text-text-decoration-001.html.ini delete mode 100644 tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-recalc.html.ini delete mode 100644 tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-serialization.tentative.html.ini create mode 100644 tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-001.html.ini create mode 100644 tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-002.html.ini delete mode 100644 tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-skip-ink-003.html.ini create mode 100644 tests/wpt/meta/css/css-pseudo/target-text-text-decoration-001.html.ini create mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-dotted-002.html.ini delete mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-line-recalc.html.ini delete mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini create mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-001.html.ini create mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-002.html.ini create mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-style-multiple.html.ini create mode 100644 tests/wpt/meta/css/css-text-decor/text-decoration-subelements-003.html.ini delete mode 100644 tests/wpt/meta/css/css-variables/variable-reference-visited.html.ini diff --git a/Cargo.lock b/Cargo.lock index 0aee7dcc7f4..5e24aaa079f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1261,7 +1261,7 @@ dependencies = [ [[package]] name = "derive_common" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "darling", "proc-macro2", @@ -3637,7 +3637,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "accountable-refcell", "app_units", @@ -5242,7 +5242,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.24.0" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "bitflags 2.5.0", "cssparser", @@ -5530,7 +5530,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "nodrop", "serde", @@ -5540,7 +5540,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "string_cache", "string_cache_codegen", @@ -5738,7 +5738,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "size_of_test" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "static_assertions", ] @@ -5879,7 +5879,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" [[package]] name = "strict-num" @@ -5916,7 +5916,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "app_units", "arrayvec", @@ -5975,7 +5975,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "lazy_static", ] @@ -5983,7 +5983,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "darling", "derive_common", @@ -6014,7 +6014,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "app_units", "bitflags 2.5.0", @@ -6377,7 +6377,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "cssparser", "servo_arc", @@ -6390,7 +6390,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-04-16#ac65c5a27c1b9faf9e7bb5bbcb3a4837a810ef6b" +source = "git+https://github.com/servo/stylo?branch=2024-04-16#d481c573aaa9ad6776b1149a5a44a045e6399157" dependencies = [ "darling", "derive_common", diff --git a/tests/wpt/meta-legacy-layout/css/css-pseudo/target-text-text-decoration-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-pseudo/target-text-text-decoration-001.html.ini new file mode 100644 index 00000000000..a73d8c891ca --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-pseudo/target-text-text-decoration-001.html.ini @@ -0,0 +1,2 @@ +[target-text-text-decoration-001.html] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-computed.html.ini index 44e2ee712b2..d8e907cb5ab 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-computed.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-computed.html.ini @@ -56,36 +56,11 @@ [Property text-decoration value 'auto'] expected: FAIL - [Property text-decoration value 'currentcolor'] - expected: FAIL - - [Property text-decoration value 'double overline underline'] - expected: FAIL - - [Property text-decoration value 'line-through'] - expected: FAIL - - [Property text-decoration value 'underline dashed rgb(0, 255, 0)'] - expected: FAIL - - [Property text-decoration value 'underline overline line-through red'] - expected: FAIL - - [Property text-decoration value 'rgba(10, 20, 30, 0.4) dotted'] - expected: FAIL - - [Property text-decoration value 'none'] - expected: FAIL - [Property text-decoration value '10px'] expected: FAIL [Property text-decoration value 'underline red from-font'] expected: FAIL - [Property text-decoration value 'solid'] - expected: FAIL - [Property text-decoration value 'from-font'] expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-valid.html.ini index 6a2d6c0ede6..88dcc5dab9b 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-valid.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/parsing/text-decoration-valid.html.ini @@ -1,22 +1,4 @@ [text-decoration-valid.html] - [e.style['text-decoration'\] = "underline dashed green" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "rgba(10, 20, 30, 0.4) dotted" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "solid" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "underline overline line-through red" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "currentcolor" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "double overline underline" should set the property value] - expected: FAIL - [e.style['text-decoration'\] = "underline auto" should set the property value] expected: FAIL @@ -37,4 +19,3 @@ [e.style['text-decoration'\] = "overline green from-font" should set the property value] expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-recalc.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-recalc.html.ini deleted file mode 100644 index 987400524bd..00000000000 --- a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-line-recalc.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-decoration-line-recalc.html] - expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-serialization.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-serialization.tentative.html.ini deleted file mode 100644 index 501b9848c78..00000000000 --- a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-serialization.tentative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[text-decoration-serialization.tentative.html] - [text-decoration shorthand serialization] - expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-001.html.ini new file mode 100644 index 00000000000..4bb024dc9f8 --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-001.html.ini @@ -0,0 +1,2 @@ +[text-decoration-shorthands-001.html] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-002.html.ini new file mode 100644 index 00000000000..28a008dfbec --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-shorthands-002.html.ini @@ -0,0 +1,2 @@ +[text-decoration-shorthands-002.html] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-skip-ink-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-skip-ink-003.html.ini deleted file mode 100644 index e680841f72d..00000000000 --- a/tests/wpt/meta-legacy-layout/css/css-text-decor/text-decoration-skip-ink-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-decoration-skip-ink-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-pseudo/target-text-text-decoration-001.html.ini b/tests/wpt/meta/css/css-pseudo/target-text-text-decoration-001.html.ini new file mode 100644 index 00000000000..a73d8c891ca --- /dev/null +++ b/tests/wpt/meta/css/css-pseudo/target-text-text-decoration-001.html.ini @@ -0,0 +1,2 @@ +[target-text-text-decoration-001.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini b/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini index 92e91411409..544d7edf011 100644 --- a/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini +++ b/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini @@ -2,36 +2,11 @@ [Property text-decoration value 'auto'] expected: FAIL - [Property text-decoration value 'currentcolor'] - expected: FAIL - - [Property text-decoration value 'double overline underline'] - expected: FAIL - - [Property text-decoration value 'line-through'] - expected: FAIL - - [Property text-decoration value 'underline dashed rgb(0, 255, 0)'] - expected: FAIL - - [Property text-decoration value 'underline overline line-through red'] - expected: FAIL - - [Property text-decoration value 'rgba(10, 20, 30, 0.4) dotted'] - expected: FAIL - - [Property text-decoration value 'none'] - expected: FAIL - [Property text-decoration value '10px'] expected: FAIL [Property text-decoration value 'underline red from-font'] expected: FAIL - [Property text-decoration value 'solid'] - expected: FAIL - [Property text-decoration value 'from-font'] expected: FAIL - diff --git a/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-valid.html.ini b/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-valid.html.ini index 68e08cee990..88dcc5dab9b 100644 --- a/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-valid.html.ini +++ b/tests/wpt/meta/css/css-text-decor/parsing/text-decoration-valid.html.ini @@ -5,36 +5,17 @@ [e.style['text-decoration'\] = "auto" should set the property value] expected: FAIL - [e.style['text-decoration'\] = "underline dashed green" should set the property value] - expected: FAIL - [e.style['text-decoration'\] = "10px" should set the property value] expected: FAIL - [e.style['text-decoration'\] = "double overline underline" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "rgba(10, 20, 30, 0.4) dotted" should set the property value] - expected: FAIL - - [e.style['text-decoration'\] = "solid" should set the property value] - expected: FAIL - [e.style['text-decoration'\] = "line-through 20px" should set the property value] expected: FAIL - [e.style['text-decoration'\] = "underline overline line-through red" should set the property value] - expected: FAIL - [e.style['text-decoration'\] = "overline 3em" should set the property value] expected: FAIL - [e.style['text-decoration'\] = "currentcolor" should set the property value] - expected: FAIL - [e.style['text-decoration'\] = "from-font" should set the property value] expected: FAIL [e.style['text-decoration'\] = "overline green from-font" should set the property value] expected: FAIL - diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-dotted-002.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-dotted-002.html.ini new file mode 100644 index 00000000000..971f8e0a0fd --- /dev/null +++ b/tests/wpt/meta/css/css-text-decor/text-decoration-dotted-002.html.ini @@ -0,0 +1,2 @@ +[text-decoration-dotted-002.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-line-recalc.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-line-recalc.html.ini deleted file mode 100644 index 987400524bd..00000000000 --- a/tests/wpt/meta/css/css-text-decor/text-decoration-line-recalc.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-decoration-line-recalc.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini deleted file mode 100644 index 501b9848c78..00000000000 --- a/tests/wpt/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[text-decoration-serialization.tentative.html] - [text-decoration shorthand serialization] - expected: FAIL - diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-001.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-001.html.ini new file mode 100644 index 00000000000..4bb024dc9f8 --- /dev/null +++ b/tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-001.html.ini @@ -0,0 +1,2 @@ +[text-decoration-shorthands-001.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-002.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-002.html.ini new file mode 100644 index 00000000000..28a008dfbec --- /dev/null +++ b/tests/wpt/meta/css/css-text-decor/text-decoration-shorthands-002.html.ini @@ -0,0 +1,2 @@ +[text-decoration-shorthands-002.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-style-multiple.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-style-multiple.html.ini new file mode 100644 index 00000000000..efc4aa161d5 --- /dev/null +++ b/tests/wpt/meta/css/css-text-decor/text-decoration-style-multiple.html.ini @@ -0,0 +1,2 @@ +[text-decoration-style-multiple.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text-decor/text-decoration-subelements-003.html.ini b/tests/wpt/meta/css/css-text-decor/text-decoration-subelements-003.html.ini new file mode 100644 index 00000000000..70b79d37490 --- /dev/null +++ b/tests/wpt/meta/css/css-text-decor/text-decoration-subelements-003.html.ini @@ -0,0 +1,2 @@ +[text-decoration-subelements-003.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-variables/variable-reference-visited.html.ini b/tests/wpt/meta/css/css-variables/variable-reference-visited.html.ini deleted file mode 100644 index 4a037f4710e..00000000000 --- a/tests/wpt/meta/css/css-variables/variable-reference-visited.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[variable-reference-visited.html] - expected: FAIL