From 5f551c94bc1c935f45c00aa3d86bbefab7e43f4c Mon Sep 17 00:00:00 2001
From: Xiaocheng Hu <xiaochengh@chromium.org>
Date: Thu, 23 Sep 2021 10:23:27 +0000
Subject: [PATCH] Bug 1729933 [wpt PR 30472] - [@layer] Use layer order to
 resolve @counter-style name conflicts, a=testonly

Automatic update from web-platform-tests
[@layer] Use layer order to resolve @counter-style name conflicts

Bug: 1095765
Change-Id: I66c2b64eb885a548f793e9cc7548dca812ab4309
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3151155
Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/main@{#919961}

--

wpt-commits: 3e87a2526832855d7c4d4556d41619a850443e4a
wpt-pr: 30472
---
 .../css-cascade/layer-counter-style-override.html  | 150 +++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 testing/web-platform/tests/css/css-cascade/layer-counter-style-override.html
diff --git a/testing/web-platform/tests/css/css-cascade/layer-counter-style-override.html b/testing/web-platform/tests/css/css-cascade/layer-counter-style-override.html
new file mode 100644
index 000000000000..7ffd3583da8b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-cascade/layer-counter-style-override.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<title>Resolving @counter-style name conflicts with cascade layers</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layering">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+#target, #reference {
+  font-family: monospace;
+  width: min-content;
+}
+
+#reference::before {
+  content: '0000';
+}
+
+@counter-style three {
+  system: cyclic;
+  symbols: '000';
+}
+
+@counter-style four {
+  system: cyclic;
+  symbols: '0000';
+}
+</style>
+
+<ul>
+  <li id="target"></li>
+  <li id="reference"></li>
+</ul>
+
+<script>
+// In all tests, #target::before should have 4 characters, same as #reference.
+
+const testCases = [
+  {
+    title: '@counter-style layered overrides unlayered',
+    style: `
+      #target::before {
+        content: counter(dont-care, custom-counter-style);
+      }
+
+      @layer {
+        @counter-style custom-counter-style {
+          system: extends four;
+        }
+      }
+
+      @counter-style custom-counter-style {
+        system: extends three;
+      }
+    `
+  },
+
+  {
+    title: '@counter-style override between layers',
+    style: `
+      @layer base, override;
+
+      #target::before {
+        content: counter(dont-care, custom-counter-style);
+      }
+
+      @layer override {
+        @counter-style custom-counter-style {
+          system: extends four;
+        }
+      }
+
+      @layer base {
+        @counter-style custom-counter-style {
+          system: extends three;
+        }
+      }
+    `
+  },
+
+  {
+    title: '@counter-style override update with appended sheet 1',
+    style: `
+      @layer base, override;
+
+      #target::before {
+        content: counter(dont-care, custom-counter-style);
+      }
+
+      @layer override {
+        @counter-style custom-counter-style {
+          system: extends four;
+        }
+      }
+    `,
+    append: `
+      @layer base {
+        @counter-style custom-counter-style {
+          system: extends three;
+        }
+      }
+    `
+  },
+
+  {
+    title: '@counter-style override update with appended sheet 2',
+    style: `
+      @layer base, override;
+
+      #target::before {
+        content: counter(dont-care, custom-counter-style);
+      }
+
+      @layer base {
+        @counter-style custom-counter-style {
+          system: extends three;
+        }
+      }
+    `,
+    append: `
+      @layer override {
+        @counter-style custom-counter-style {
+          system: extends four;
+        }
+      }
+    `
+  },
+];
+
+for (let testCase of testCases) {
+  var documentStyle = document.createElement('style');
+  documentStyle.appendChild(document.createTextNode(testCase['style']));
+  document.head.appendChild(documentStyle);
+
+  var appendedStyle;
+  if (testCase['append']) {
+    document.body.offsetLeft;  // Force style update
+    appendedStyle = document.createElement('style');
+    appendedStyle.appendChild(document.createTextNode(testCase['append']));
+    document.head.appendChild(appendedStyle);
+  }
+
+  test(function () {
+    assert_equals(getComputedStyle(target).width,
+                  getComputedStyle(reference).width);
+  }, testCase['title']);
+
+  if (appendedStyle)
+    appendedStyle.remove();
+  documentStyle.remove();
+}
+</script>
-- 
2.11.4.GIT

