From eb294cefd00e7b1a804fa14c239f1ba259b1629c Mon Sep 17 00:00:00 2001
From: Daniil Sakhapov <sakhapov@chromium.org>
Date: Tue, 18 Jun 2024 16:46:20 +0000
Subject: [PATCH] Bug 1902735 [wpt PR 46764] - Fix counters instantiating,
 a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests
Fix counters instantiating

As per https://drafts.csswg.org/css-lists/#instantiating-counters:

If innermost counter’s originating element is element or a previous
sibling of element, remove innermost counter from counters.

Fixed: 346974104
Change-Id: I938a13937cd629a9a4758483c0e118501629e302
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5630408
Reviewed-by: Vladimir Levin <vmpstr@chromium.org>
Commit-Queue: Daniil Sakhapov <sakhapov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1315384}

--

wpt-commits: 03c98d6db3f0f140a4f8ed706dc2737599f673f6
wpt-pr: 46764
---
 .../css/css-lists/counter-set-001-ref.html    | 12 +++---
 .../tests/css/css-lists/counter-set-001.html  | 12 +++---
 .../tests/css/css-lists/counters-005-ref.html |  4 +-
 .../tests/css/css-lists/counters-005.html     |  2 +-
 .../tests/css/css-lists/counters-006-ref.html | 17 +++++++++
 .../tests/css/css-lists/counters-006.html     | 38 +++++++++++++++++++
 6 files changed, 70 insertions(+), 15 deletions(-)
 create mode 100644 testing/web-platform/tests/css/css-lists/counters-006-ref.html
 create mode 100644 testing/web-platform/tests/css/css-lists/counters-006.html

diff --git a/testing/web-platform/tests/css/css-lists/counter-set-001-ref.html b/testing/web-platform/tests/css/css-lists/counter-set-001-ref.html
index 2b5eb90ccfc61..301197904a5af 100644
--- a/testing/web-platform/tests/css/css-lists/counter-set-001-ref.html
+++ b/testing/web-platform/tests/css/css-lists/counter-set-001-ref.html
@@ -21,17 +21,17 @@
 <span>6</span><!-- "6" -->
 <span>0</span><!-- "0" -->
 <x>
-  <span>0.2</span><!-- "0.2" -->
+  <span>2</span><!-- "2" -->
 </x>
-<span>0.3</span><!-- "0.3" -->
+<span>3</span><!-- "3" -->
 <x>
-  <span>0.3.0</span><!-- "0.3.0" -->
-  <span>0.3.2</span><!-- "0.3.2" -->
+  <span>0</span><!-- "0" -->
+  <span>2</span><!-- "2" -->
   <x>
-    <span>0.3.2.5</span><!-- "0.3.2.5" -->
+    <span>2.5</span><!-- "2.5" -->
   </x>
 </x>
-<span>0.3.3</span><!-- "0.3.3" -->
+<span>3</span><!-- "3" -->
 
 </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-lists/counter-set-001.html b/testing/web-platform/tests/css/css-lists/counter-set-001.html
index 6ec53e3bfa123..4e28367798ae6 100644
--- a/testing/web-platform/tests/css/css-lists/counter-set-001.html
+++ b/testing/web-platform/tests/css/css-lists/counter-set-001.html
@@ -24,17 +24,17 @@
 <span style="counter-set: n 6; counter-increment: n 2"></span><!-- "6" -->
 <span style="counter-set: n; counter-increment: n 2"></span><!-- "0" -->
 <x style="counter-reset: n 9">
-  <span style="counter-set: n 2"></span><!-- "0.2" -->
+  <span style="counter-set: n 2"></span><!-- "2" -->
 </x>
-<span style="counter-increment: n"></span><!-- "0.3" -->
+<span style="counter-increment: n"></span><!-- "3" -->
 <x style="counter-reset: n 9">
-  <span style="counter-set: n"></span><!-- "0.3.0" -->
-  <span style="counter-set: n 2"></span><!-- "0.3.2" -->
+  <span style="counter-set: n"></span><!-- "0" -->
+  <span style="counter-set: n 2"></span><!-- "2" -->
   <x style="counter-reset: n 1">
-    <span style="counter-set: n 5"></span><!-- "0.3.2.5" -->
+    <span style="counter-set: n 5"></span><!-- "2.5" -->
   </x>
 </x>
-<span style="counter-increment: n"></span><!-- "0.3.3" -->
+<span style="counter-increment: n"></span><!-- "3" -->
 
 </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-lists/counters-005-ref.html b/testing/web-platform/tests/css/css-lists/counters-005-ref.html
index 232bab76a1066..509a097ef4688 100644
--- a/testing/web-platform/tests/css/css-lists/counters-005-ref.html
+++ b/testing/web-platform/tests/css/css-lists/counters-005-ref.html
@@ -12,8 +12,8 @@
 
  <p>The following two lines should be identical:</p>
 
- <div>B 1 1.0 1 1.0</div>
- <div>B 1 1.0 1 1.0</div>
+ <div>B 1 0 1 1.0</div>
+ <div>B 1 0 1 1.0</div>
 
  </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-lists/counters-005.html b/testing/web-platform/tests/css/css-lists/counters-005.html
index 12908e6472086..528c0ede8701d 100644
--- a/testing/web-platform/tests/css/css-lists/counters-005.html
+++ b/testing/web-platform/tests/css/css-lists/counters-005.html
@@ -32,7 +32,7 @@
    </span>
  </div>
 
- <div>B 1 1.0 1 1.0</div>
+ <div>B 1 0 1 1.0</div>
 
  </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-lists/counters-006-ref.html b/testing/web-platform/tests/css/css-lists/counters-006-ref.html
new file mode 100644
index 0000000000000..8e21dca4cee41
--- /dev/null
+++ b/testing/web-platform/tests/css/css-lists/counters-006-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>CSS Lists Ref Test: counters instantiating</title>
+<link rel="author" title="Daniil Sakhapov" href="mailto:sakhapov@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-lists-3/#instantiating-counters">
+<style type="text/css">
+  * {
+    padding: 0;
+    margin: 0;
+  }
+</style>
+
+<div>1.1.1.1</div>
+<div>1.2.1.2</div>
+<div>1.3.1.3</div>
+<div>2.1.2.1</div>
+<div>2.2.2.2</div>
+<div>2.3.2.3</div>
diff --git a/testing/web-platform/tests/css/css-lists/counters-006.html b/testing/web-platform/tests/css/css-lists/counters-006.html
new file mode 100644
index 0000000000000..63a65a7ff83a8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-lists/counters-006.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<title>CSS Lists: counters instantiating</title>
+<link rel="author" title="Daniil Sakhapov" href="mailto:sakhapov@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-lists-3/#instantiating-counters">
+<link rel="match" href="counters-006-ref.html">
+<style type="text/css">
+  * {
+    padding: 0;
+    margin: 0;
+  }
+
+  .test {
+    counter-increment: section;
+    counter-reset: multilevel;
+  }
+
+  ol[multilevel] > li::before {
+    content: counter(section) "." counters(multilevel, ".") ".";
+    counter-increment: multilevel;
+  }
+
+  ol[multilevel] {
+    list-style: none !important;
+    clear: both;
+  }
+</style>
+<div class="test"></div>
+<ol multilevel="multilevel">
+  <li>1.1</li>
+  <li>1.2</li>
+  <li>1.3</li>
+</ol>
+<div class="test"></div>
+<ol multilevel="multilevel">
+  <li>2.1</li>
+  <li>2.2</li>
+  <li>2.3</li>
+</ol>