From 52ba8facc2e3624002db6753042f36820a4ae859 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Thu, 7 Aug 2025 11:41:22 +0100
Subject: [PATCH] stylo: use simplified restyle damage macros (#38465)

Servo PR for https://github.com/servo/stylo/pull/222

Fixes: #38506
Testing: adding new tests

---------

Signed-off-by: Nico Burns <nico@nicoburns.com>
Signed-off-by: Oriol Brufau <obrufau@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>
---
 Cargo.lock                                    | 24 ++++++------
 tests/wpt/meta/MANIFEST.json                  | 26 +++++++++++++
 .../mix-blend-mode-stacking-context-002.html  | 37 +++++++++++++++++++
 .../clip-path-stacking-context-001.html       | 37 +++++++++++++++++++
 4 files changed, 112 insertions(+), 12 deletions(-)
 create mode 100644 tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-002.html
 create mode 100644 tests/wpt/tests/css/css-masking/clip-path/clip-path-stacking-context-001.html

diff --git a/Cargo.lock b/Cargo.lock
index ff0b2735595..5f564700aff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7314,7 +7314,7 @@ dependencies = [
 [[package]]
 name = "selectors"
 version = "0.31.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "bitflags 2.9.1",
  "cssparser",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "servo_arc"
 version = "0.4.1"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -8092,7 +8092,7 @@ dependencies = [
 [[package]]
 name = "stylo"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "app_units",
  "arrayvec",
@@ -8149,7 +8149,7 @@ dependencies = [
 [[package]]
 name = "stylo_atoms"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "string_cache",
  "string_cache_codegen",
@@ -8158,12 +8158,12 @@ dependencies = [
 [[package]]
 name = "stylo_config"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 
 [[package]]
 name = "stylo_derive"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -8175,7 +8175,7 @@ dependencies = [
 [[package]]
 name = "stylo_dom"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "bitflags 2.9.1",
  "stylo_malloc_size_of",
@@ -8184,7 +8184,7 @@ dependencies = [
 [[package]]
 name = "stylo_malloc_size_of"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "app_units",
  "cssparser",
@@ -8201,12 +8201,12 @@ dependencies = [
 [[package]]
 name = "stylo_static_prefs"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 
 [[package]]
 name = "stylo_traits"
 version = "0.6.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "app_units",
  "bitflags 2.9.1",
@@ -8621,7 +8621,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 [[package]]
 name = "to_shmem"
 version = "0.2.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "cssparser",
  "servo_arc",
@@ -8634,7 +8634,7 @@ dependencies = [
 [[package]]
 name = "to_shmem_derive"
 version = "0.1.0"
-source = "git+https://github.com/servo/stylo?branch=2025-08-01#0d8dd5455daf3bc445312032a0a430e11a817390"
+source = "git+https://github.com/servo/stylo?branch=2025-08-01#092e34b20bd666da62b7dfc1da5c5e0b64d3c960"
 dependencies = [
  "darling",
  "proc-macro2",
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 9c36d2319d4..f21e2ece4ad 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -125283,6 +125283,19 @@
         {}
        ]
       ],
+      "mix-blend-mode-stacking-context-002.html": [
+       "29d205cfcb19ffc64e3e64d9b5dbf4df1b495e8f",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-200px-square.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mix-blend-mode-stacking-context-creates-isolation.html": [
        "79edf0f0908731949e8005f699f09ed1b3ceed69",
        [
@@ -218074,6 +218087,19 @@
         {}
        ]
       ],
+      "clip-path-stacking-context-001.html": [
+       "65948ea5bfd028db117497248dae538f77927bb4",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-200px-square.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-strokeBox-1a.html": [
        "37cec39ff808bc51e837ecc9d03725a22c20a989",
        [
diff --git a/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-002.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-002.html
new file mode 100644
index 00000000000..29d205cfcb1
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-stacking-context-002.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>CSS Compositing: mix-blend-mode changing dynamically</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.fxtf.org/compositing-1/#mix-blend-mode">
+<link rel="help" href="https://github.com/servo/servo/issues/38506">
+<meta name="assert" content="Dynamic changes of mix-blend-mode can start or stop establishing a stacking context.">
+<link rel="match" href="../../reference/ref-filled-green-200px-square.html">
+<style>
+.target {
+  width: 200px;
+  height: 100px;
+  position: relative;
+}
+.target > div {
+  position: absolute;
+  inset: 0;
+  z-index: -1;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="a" class="target" style="mix-blend-mode: normal; background: red">
+  <div style="background: green"></div>
+</div>
+<div id="b" class="target" style="mix-blend-mode: multiply; background: green">
+  <div style="background: red"></div>
+</div>
+<script src="/common/reftest-wait.js"></script>
+<script>
+requestAnimationFrame(() => requestAnimationFrame(() => {
+  document.getElementById("a").style.mixBlendMode = "multiply";
+  document.getElementById("b").style.mixBlendMode = "normal";
+  takeScreenshot();
+}));
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-stacking-context-001.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-stacking-context-001.html
new file mode 100644
index 00000000000..65948ea5bfd
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-stacking-context-001.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>CSS Masking: clip-path changing dynamically</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.fxtf.org/css-masking/#the-clip-path">
+<link rel="help" href="https://github.com/servo/servo/issues/38506">
+<meta name="assert" content="Dynamic changes of clip-path can start or stop establishing a stacking context.">
+<link rel="match" href="../../reference/ref-filled-green-200px-square.html">
+<style>
+.target {
+  width: 200px;
+  height: 100px;
+  position: relative;
+}
+.target > div {
+  position: absolute;
+  inset: 0;
+  z-index: -1;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="a" class="target" style="clip-path: none; background: red">
+  <div style="background: green"></div>
+</div>
+<div id="b" class="target" style="clip-path: inset(0); background: green">
+  <div style="background: red"></div>
+</div>
+<script src="/common/reftest-wait.js"></script>
+<script>
+requestAnimationFrame(() => requestAnimationFrame(() => {
+  document.getElementById("a").style.clipPath = "inset(0)";
+  document.getElementById("b").style.clipPath = "none";
+  takeScreenshot();
+}));
+</script>
+</html>