diff options
author | Martin Robinson <mrobinson@igalia.com> | 2024-10-29 18:50:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-29 17:50:33 +0000 |
commit | d5554235febb7b12906b01bf7c170ddb1e7d0bb4 (patch) | |
tree | a68134a35505f08dabf252f52aad327a38165dc3 | |
parent | d17321f53d28cbaeed8c1d0ed0d6e317143e6ab6 (diff) | |
download | servo-d5554235febb7b12906b01bf7c170ddb1e7d0bb4.tar.gz servo-d5554235febb7b12906b01bf7c170ddb1e7d0bb4.zip |
layout: Add support for `mix-blend-mode: plus-lighter` (#34057)
This just requires translating the style value into a WebRender value.
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
6 files changed, 14 insertions, 19 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5991801a6cc..59c51fc115a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1638,7 +1638,7 @@ dependencies = [ [[package]] name = "dom" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "bitflags 2.6.0", ] @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "accountable-refcell", "app_units", @@ -6263,7 +6263,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.25.0" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "bitflags 2.6.0", "cssparser", @@ -6551,7 +6551,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.0" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "serde", "stable_deref_trait", @@ -6560,7 +6560,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "string_cache", "string_cache_codegen", @@ -6913,7 +6913,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" [[package]] name = "strck" @@ -6966,7 +6966,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "app_units", "arrayvec", @@ -7024,7 +7024,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "lazy_static", ] @@ -7032,7 +7032,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "darling", "proc-macro2", @@ -7062,7 +7062,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "app_units", "bitflags 2.6.0", @@ -7431,7 +7431,7 @@ dependencies = [ [[package]] name = "to_shmem" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "cssparser", "servo_arc", @@ -7444,7 +7444,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-10-04#789ab89c30d94e25f514c19c079a00a6ab583638" +source = "git+https://github.com/servo/stylo?branch=2024-10-04#1c069c5e62fb70a64f3305fcafed2c12073608b8" dependencies = [ "darling", "proc-macro2", diff --git a/components/layout/display_list/conversions.rs b/components/layout/display_list/conversions.rs index 30af153fe20..17e5b29f16d 100644 --- a/components/layout/display_list/conversions.rs +++ b/components/layout/display_list/conversions.rs @@ -102,6 +102,7 @@ impl ToLayout for MixBlendMode { MixBlendMode::Saturation => wr::MixBlendMode::Saturation, MixBlendMode::Color => wr::MixBlendMode::Color, MixBlendMode::Luminosity => wr::MixBlendMode::Luminosity, + MixBlendMode::PlusLighter => wr::MixBlendMode::PlusLighter, } } } diff --git a/components/layout_2020/display_list/conversions.rs b/components/layout_2020/display_list/conversions.rs index cfa9192d0e6..79f2ec5f63f 100644 --- a/components/layout_2020/display_list/conversions.rs +++ b/components/layout_2020/display_list/conversions.rs @@ -70,6 +70,7 @@ impl ToWebRender for ComputedMixBlendMode { ComputedMixBlendMode::Saturation => MixBlendMode::Saturation, ComputedMixBlendMode::Color => MixBlendMode::Color, ComputedMixBlendMode::Luminosity => MixBlendMode::Luminosity, + ComputedMixBlendMode::PlusLighter => MixBlendMode::PlusLighter, } } } diff --git a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html.ini b/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html.ini deleted file mode 100644 index b0796527bd7..00000000000 --- a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-parsing.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[mix-blend-mode-parsing.html] - [Mix-blend-mode plus-lighter] - expected: FAIL diff --git a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html.ini b/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html.ini deleted file mode 100644 index 88ceb05d71f..00000000000 --- a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter-basic.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[mix-blend-mode-plus-lighter-basic.html] - expected: FAIL diff --git a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html.ini b/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html.ini deleted file mode 100644 index d3e95cf5702..00000000000 --- a/tests/wpt/meta/css/compositing/mix-blend-mode/mix-blend-mode-plus-lighter.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[mix-blend-mode-plus-lighter.html] - expected: FAIL |