[webkit-changes] [291054] trunk

Wed, 09 Mar 2022 10:33:14 -0800

Title: [291054] trunk
Revision
291054
Author
[email protected]
Date
2022-03-09 10:32:14 -0800 (Wed, 09 Mar 2022)

Log Message

[css-lists] css/css-lists/inherit-overwrites.html and css/css-lists/li-counter-increment-computed-style.html are unique failures
https://bugs.webkit.org/show_bug.cgi?id=237642

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

* web-platform-tests/css/css-lists/inherit-overwrites-expected.txt:
* web-platform-tests/css/css-lists/li-counter-increment-computed-style-expected.txt:
* web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles-expected.txt:

Source/WebCore:

A std::nullopt means the property isn't set, not that it shoudl be 0.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::counterToCSSValue):

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (291053 => 291054)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2022-03-09 18:16:03 UTC (rev 291053)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2022-03-09 18:32:14 UTC (rev 291054)
@@ -1,3 +1,14 @@
+2022-03-09  Antoine Quint  <[email protected]>
+
+        [css-lists] css/css-lists/inherit-overwrites.html and css/css-lists/li-counter-increment-computed-style.html are unique failures
+        https://bugs.webkit.org/show_bug.cgi?id=237642
+
+        Reviewed by Antti Koivisto.
+
+        * web-platform-tests/css/css-lists/inherit-overwrites-expected.txt:
+        * web-platform-tests/css/css-lists/li-counter-increment-computed-style-expected.txt:
+        * web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles-expected.txt:
+
 2022-03-09  Antti Koivisto  <[email protected]>
 
         [CSS Container Queries] Remove size() function syntax

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inherit-overwrites-expected.txt (291053 => 291054)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inherit-overwrites-expected.txt	2022-03-09 18:16:03 UTC (rev 291053)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/inherit-overwrites-expected.txt	2022-03-09 18:32:14 UTC (rev 291054)
@@ -1,4 +1,4 @@
 
-FAIL Inheritance of counter-reset replaces existing value assert_equals: expected "second 0 first 1" but got "second 0 fifth 0 first 1"
-FAIL Inheritance of counter-increment replaces existing value assert_equals: expected "second 2 first 0" but got "second 2 fourth 0 first 0"
+PASS Inheritance of counter-reset replaces existing value
+PASS Inheritance of counter-increment replaces existing value

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-counter-increment-computed-style-expected.txt (291053 => 291054)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-counter-increment-computed-style-expected.txt	2022-03-09 18:16:03 UTC (rev 291053)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-lists/li-counter-increment-computed-style-expected.txt	2022-03-09 18:32:14 UTC (rev 291054)
@@ -5,5 +5,5 @@
 Explicit and redundant list-item counter.
 Other counter.
 
-FAIL list-item counter-increment shouldn't be visible from computed style assert_equals: Inherited expected "none" but got ""
+PASS list-item counter-increment shouldn't be visible from computed style

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles-expected.txt (291053 => 291054)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles-expected.txt	2022-03-09 18:16:03 UTC (rev 291053)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/lists/lists-styles-expected.txt	2022-03-09 18:32:14 UTC (rev 291054)
@@ -163,9 +163,9 @@
    <li> - counter-set
 FAIL <menu>
    <li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu>
-   <li> - counter-increment assert_equals: expected "list-item 0" but got "none"
 PASS <menu>
+   <li> - counter-increment
+PASS <menu>
    <li> - text-align
 PASS <li> (in <menu>) - display
 PASS <li> (in <menu>) - margin-top
@@ -205,9 +205,9 @@
    <li> - counter-set
 FAIL <ol>
    <li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol>
-   <li> - counter-increment assert_equals: expected "list-item 0" but got "none"
 PASS <ol>
+   <li> - counter-increment
+PASS <ol>
    <li> - text-align
 PASS <li> (in <ol>) - display
 PASS <li> (in <ol>) - margin-top
@@ -247,9 +247,9 @@
    <li> - counter-set
 FAIL <ul>
    <li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul>
-   <li> - counter-increment assert_equals: expected "list-item 0" but got "none"
 PASS <ul>
+   <li> - counter-increment
+PASS <ul>
    <li> - text-align
 PASS <li> (in <ul>) - display
 PASS <li> (in <ul>) - margin-top
@@ -291,7 +291,7 @@
 FAIL <menu> (in <dir>) - list-style-type assert_equals: expected "circle" but got "disc"
 PASS <menu> (in <dir>) - counter-set
 FAIL <menu> (in <dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <dir>) - counter-increment
 PASS <menu> (in <dir>) - text-align
 PASS <ul> (in <dir>) - display
 FAIL <ul> (in <dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -305,7 +305,7 @@
 FAIL <ul> (in <dir>) - list-style-type assert_equals: expected "circle" but got "disc"
 PASS <ul> (in <dir>) - counter-set
 FAIL <ul> (in <dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <dir>) - counter-increment
 PASS <ul> (in <dir>) - text-align
 PASS <dir> (in <menu>) - display
 FAIL <dir> (in <menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -333,7 +333,7 @@
 FAIL <menu> (in <menu>) - list-style-type assert_equals: expected "circle" but got "disc"
 PASS <menu> (in <menu>) - counter-set
 FAIL <menu> (in <menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <menu>) - counter-increment
 PASS <menu> (in <menu>) - text-align
 PASS <ul> (in <menu>) - display
 FAIL <ul> (in <menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -347,7 +347,7 @@
 FAIL <ul> (in <menu>) - list-style-type assert_equals: expected "circle" but got "disc"
 PASS <ul> (in <menu>) - counter-set
 FAIL <ul> (in <menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <menu>) - counter-increment
 PASS <ul> (in <menu>) - text-align
 PASS <dir> (in <ol>) - display
 FAIL <dir> (in <ol>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -375,7 +375,7 @@
 FAIL <menu> (in <ol>) - list-style-type assert_equals: expected "circle" but got "disc"
 PASS <menu> (in <ol>) - counter-set
 FAIL <menu> (in <ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ol>) - counter-increment
 PASS <menu> (in <ol>) - text-align
 PASS <ul> (in <ol>) - display
 PASS <ul> (in <ol>) - margin-top
@@ -389,7 +389,7 @@
 PASS <ul> (in <ol>) - list-style-type
 PASS <ul> (in <ol>) - counter-set
 FAIL <ul> (in <ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ol>) - counter-increment
 PASS <ul> (in <ol>) - text-align
 PASS <dir> (in <ul>) - display
 FAIL <dir> (in <ul>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -417,7 +417,7 @@
 FAIL <menu> (in <ul>) - list-style-type assert_equals: expected "circle" but got "disc"
 PASS <menu> (in <ul>) - counter-set
 FAIL <menu> (in <ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ul>) - counter-increment
 PASS <menu> (in <ul>) - text-align
 PASS <ul> (in <ul>) - display
 PASS <ul> (in <ul>) - margin-top
@@ -431,7 +431,7 @@
 PASS <ul> (in <ul>) - list-style-type
 PASS <ul> (in <ul>) - counter-set
 FAIL <ul> (in <ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ul>) - counter-increment
 PASS <ul> (in <ul>) - text-align
 PASS <dir> (in <dir><dir>) - display
 FAIL <dir> (in <dir><dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -459,7 +459,7 @@
 FAIL <menu> (in <dir><dir>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <dir><dir>) - counter-set
 FAIL <menu> (in <dir><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <dir><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <dir><dir>) - counter-increment
 PASS <menu> (in <dir><dir>) - text-align
 PASS <ul> (in <dir><dir>) - display
 FAIL <ul> (in <dir><dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -473,7 +473,7 @@
 FAIL <ul> (in <dir><dir>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <ul> (in <dir><dir>) - counter-set
 FAIL <ul> (in <dir><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <dir><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <dir><dir>) - counter-increment
 PASS <ul> (in <dir><dir>) - text-align
 PASS <dir> (in <dir><menu>) - display
 FAIL <dir> (in <dir><menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -501,7 +501,7 @@
 FAIL <menu> (in <dir><menu>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <dir><menu>) - counter-set
 FAIL <menu> (in <dir><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <dir><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <dir><menu>) - counter-increment
 PASS <menu> (in <dir><menu>) - text-align
 PASS <ul> (in <dir><menu>) - display
 FAIL <ul> (in <dir><menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -515,7 +515,7 @@
 FAIL <ul> (in <dir><menu>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <ul> (in <dir><menu>) - counter-set
 FAIL <ul> (in <dir><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <dir><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <dir><menu>) - counter-increment
 PASS <ul> (in <dir><menu>) - text-align
 PASS <dir> (in <dir><ol>) - display
 FAIL <dir> (in <dir><ol>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -543,7 +543,7 @@
 FAIL <menu> (in <dir><ol>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <dir><ol>) - counter-set
 FAIL <menu> (in <dir><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <dir><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <dir><ol>) - counter-increment
 PASS <menu> (in <dir><ol>) - text-align
 PASS <ul> (in <dir><ol>) - display
 PASS <ul> (in <dir><ol>) - margin-top
@@ -557,7 +557,7 @@
 FAIL <ul> (in <dir><ol>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <dir><ol>) - counter-set
 FAIL <ul> (in <dir><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <dir><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <dir><ol>) - counter-increment
 PASS <ul> (in <dir><ol>) - text-align
 PASS <dir> (in <dir><ul>) - display
 FAIL <dir> (in <dir><ul>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -585,7 +585,7 @@
 FAIL <menu> (in <dir><ul>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <dir><ul>) - counter-set
 FAIL <menu> (in <dir><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <dir><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <dir><ul>) - counter-increment
 PASS <menu> (in <dir><ul>) - text-align
 PASS <ul> (in <dir><ul>) - display
 PASS <ul> (in <dir><ul>) - margin-top
@@ -599,7 +599,7 @@
 FAIL <ul> (in <dir><ul>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <dir><ul>) - counter-set
 FAIL <ul> (in <dir><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <dir><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <dir><ul>) - counter-increment
 PASS <ul> (in <dir><ul>) - text-align
 PASS <dir> (in <menu><dir>) - display
 FAIL <dir> (in <menu><dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -627,7 +627,7 @@
 FAIL <menu> (in <menu><dir>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <menu><dir>) - counter-set
 FAIL <menu> (in <menu><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <menu><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <menu><dir>) - counter-increment
 PASS <menu> (in <menu><dir>) - text-align
 PASS <ul> (in <menu><dir>) - display
 FAIL <ul> (in <menu><dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -641,7 +641,7 @@
 FAIL <ul> (in <menu><dir>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <ul> (in <menu><dir>) - counter-set
 FAIL <ul> (in <menu><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <menu><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <menu><dir>) - counter-increment
 PASS <ul> (in <menu><dir>) - text-align
 PASS <dir> (in <menu><menu>) - display
 FAIL <dir> (in <menu><menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -669,7 +669,7 @@
 FAIL <menu> (in <menu><menu>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <menu><menu>) - counter-set
 FAIL <menu> (in <menu><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <menu><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <menu><menu>) - counter-increment
 PASS <menu> (in <menu><menu>) - text-align
 PASS <ul> (in <menu><menu>) - display
 FAIL <ul> (in <menu><menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -683,7 +683,7 @@
 FAIL <ul> (in <menu><menu>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <ul> (in <menu><menu>) - counter-set
 FAIL <ul> (in <menu><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <menu><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <menu><menu>) - counter-increment
 PASS <ul> (in <menu><menu>) - text-align
 PASS <dir> (in <menu><ol>) - display
 FAIL <dir> (in <menu><ol>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -711,7 +711,7 @@
 FAIL <menu> (in <menu><ol>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <menu><ol>) - counter-set
 FAIL <menu> (in <menu><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <menu><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <menu><ol>) - counter-increment
 PASS <menu> (in <menu><ol>) - text-align
 PASS <ul> (in <menu><ol>) - display
 PASS <ul> (in <menu><ol>) - margin-top
@@ -725,7 +725,7 @@
 FAIL <ul> (in <menu><ol>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <menu><ol>) - counter-set
 FAIL <ul> (in <menu><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <menu><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <menu><ol>) - counter-increment
 PASS <ul> (in <menu><ol>) - text-align
 PASS <dir> (in <menu><ul>) - display
 FAIL <dir> (in <menu><ul>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -753,7 +753,7 @@
 FAIL <menu> (in <menu><ul>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <menu><ul>) - counter-set
 FAIL <menu> (in <menu><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <menu><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <menu><ul>) - counter-increment
 PASS <menu> (in <menu><ul>) - text-align
 PASS <ul> (in <menu><ul>) - display
 PASS <ul> (in <menu><ul>) - margin-top
@@ -767,7 +767,7 @@
 FAIL <ul> (in <menu><ul>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <menu><ul>) - counter-set
 FAIL <ul> (in <menu><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <menu><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <menu><ul>) - counter-increment
 PASS <ul> (in <menu><ul>) - text-align
 PASS <dir> (in <ol><dir>) - display
 FAIL <dir> (in <ol><dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -795,7 +795,7 @@
 FAIL <menu> (in <ol><dir>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ol><dir>) - counter-set
 FAIL <menu> (in <ol><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ol><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ol><dir>) - counter-increment
 PASS <menu> (in <ol><dir>) - text-align
 PASS <ul> (in <ol><dir>) - display
 PASS <ul> (in <ol><dir>) - margin-top
@@ -809,7 +809,7 @@
 FAIL <ul> (in <ol><dir>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <ol><dir>) - counter-set
 FAIL <ul> (in <ol><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ol><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ol><dir>) - counter-increment
 PASS <ul> (in <ol><dir>) - text-align
 PASS <dir> (in <ol><menu>) - display
 FAIL <dir> (in <ol><menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -837,7 +837,7 @@
 FAIL <menu> (in <ol><menu>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ol><menu>) - counter-set
 FAIL <menu> (in <ol><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ol><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ol><menu>) - counter-increment
 PASS <menu> (in <ol><menu>) - text-align
 PASS <ul> (in <ol><menu>) - display
 PASS <ul> (in <ol><menu>) - margin-top
@@ -851,7 +851,7 @@
 FAIL <ul> (in <ol><menu>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <ol><menu>) - counter-set
 FAIL <ul> (in <ol><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ol><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ol><menu>) - counter-increment
 PASS <ul> (in <ol><menu>) - text-align
 PASS <dir> (in <ol><ol>) - display
 FAIL <dir> (in <ol><ol>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -879,7 +879,7 @@
 FAIL <menu> (in <ol><ol>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ol><ol>) - counter-set
 FAIL <menu> (in <ol><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ol><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ol><ol>) - counter-increment
 PASS <menu> (in <ol><ol>) - text-align
 PASS <ul> (in <ol><ol>) - display
 PASS <ul> (in <ol><ol>) - margin-top
@@ -893,7 +893,7 @@
 PASS <ul> (in <ol><ol>) - list-style-type
 PASS <ul> (in <ol><ol>) - counter-set
 FAIL <ul> (in <ol><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ol><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ol><ol>) - counter-increment
 PASS <ul> (in <ol><ol>) - text-align
 PASS <dir> (in <ol><ul>) - display
 FAIL <dir> (in <ol><ul>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -921,7 +921,7 @@
 FAIL <menu> (in <ol><ul>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ol><ul>) - counter-set
 FAIL <menu> (in <ol><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ol><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ol><ul>) - counter-increment
 PASS <menu> (in <ol><ul>) - text-align
 PASS <ul> (in <ol><ul>) - display
 PASS <ul> (in <ol><ul>) - margin-top
@@ -935,7 +935,7 @@
 PASS <ul> (in <ol><ul>) - list-style-type
 PASS <ul> (in <ol><ul>) - counter-set
 FAIL <ul> (in <ol><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ol><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ol><ul>) - counter-increment
 PASS <ul> (in <ol><ul>) - text-align
 PASS <dir> (in <ul><dir>) - display
 FAIL <dir> (in <ul><dir>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -963,7 +963,7 @@
 FAIL <menu> (in <ul><dir>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ul><dir>) - counter-set
 FAIL <menu> (in <ul><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ul><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ul><dir>) - counter-increment
 PASS <menu> (in <ul><dir>) - text-align
 PASS <ul> (in <ul><dir>) - display
 PASS <ul> (in <ul><dir>) - margin-top
@@ -977,7 +977,7 @@
 FAIL <ul> (in <ul><dir>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <ul><dir>) - counter-set
 FAIL <ul> (in <ul><dir>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ul><dir>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ul><dir>) - counter-increment
 PASS <ul> (in <ul><dir>) - text-align
 PASS <dir> (in <ul><menu>) - display
 FAIL <dir> (in <ul><menu>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -1005,7 +1005,7 @@
 FAIL <menu> (in <ul><menu>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ul><menu>) - counter-set
 FAIL <menu> (in <ul><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ul><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ul><menu>) - counter-increment
 PASS <menu> (in <ul><menu>) - text-align
 PASS <ul> (in <ul><menu>) - display
 PASS <ul> (in <ul><menu>) - margin-top
@@ -1019,7 +1019,7 @@
 FAIL <ul> (in <ul><menu>) - list-style-type assert_equals: expected "square" but got "circle"
 PASS <ul> (in <ul><menu>) - counter-set
 FAIL <ul> (in <ul><menu>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ul><menu>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ul><menu>) - counter-increment
 PASS <ul> (in <ul><menu>) - text-align
 PASS <dir> (in <ul><ol>) - display
 FAIL <dir> (in <ul><ol>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -1047,7 +1047,7 @@
 FAIL <menu> (in <ul><ol>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ul><ol>) - counter-set
 FAIL <menu> (in <ul><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ul><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ul><ol>) - counter-increment
 PASS <menu> (in <ul><ol>) - text-align
 PASS <ul> (in <ul><ol>) - display
 PASS <ul> (in <ul><ol>) - margin-top
@@ -1061,7 +1061,7 @@
 PASS <ul> (in <ul><ol>) - list-style-type
 PASS <ul> (in <ul><ol>) - counter-set
 FAIL <ul> (in <ul><ol>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ul><ol>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ul><ol>) - counter-increment
 PASS <ul> (in <ul><ol>) - text-align
 PASS <dir> (in <ul><ul>) - display
 FAIL <dir> (in <ul><ul>) - margin-top assert_equals: expected "0px" but got "16px"
@@ -1089,7 +1089,7 @@
 FAIL <menu> (in <ul><ul>) - list-style-type assert_equals: expected "square" but got "disc"
 PASS <menu> (in <ul><ul>) - counter-set
 FAIL <menu> (in <ul><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <menu> (in <ul><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <menu> (in <ul><ul>) - counter-increment
 PASS <menu> (in <ul><ul>) - text-align
 PASS <ul> (in <ul><ul>) - display
 PASS <ul> (in <ul><ul>) - margin-top
@@ -1103,7 +1103,7 @@
 PASS <ul> (in <ul><ul>) - list-style-type
 PASS <ul> (in <ul><ul>) - counter-set
 FAIL <ul> (in <ul><ul>) - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ul> (in <ul><ul>) - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ul> (in <ul><ul>) - counter-increment
 PASS <ul> (in <ul><ul>) - text-align
 PASS <ol type="1"> - display
 PASS <ol type="1"> - margin-top
@@ -1117,7 +1117,7 @@
 PASS <ol type="1"> - list-style-type
 PASS <ol type="1"> - counter-set
 FAIL <ol type="1"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="1"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="1"> - counter-increment
 PASS <ol type="1"> - text-align
 PASS <li type="1"> - display
 PASS <li type="1"> - margin-top
@@ -1145,7 +1145,7 @@
 PASS <ol type="a" class="type-a"> - list-style-type
 PASS <ol type="a" class="type-a"> - counter-set
 FAIL <ol type="a" class="type-a"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="a" class="type-a"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="a" class="type-a"> - counter-increment
 PASS <ol type="a" class="type-a"> - text-align
 PASS <li type="a" class="type-a"> - display
 PASS <li type="a" class="type-a"> - margin-top
@@ -1173,7 +1173,7 @@
 PASS <ol type="A" class="type-A"> - list-style-type
 PASS <ol type="A" class="type-A"> - counter-set
 FAIL <ol type="A" class="type-A"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="A" class="type-A"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="A" class="type-A"> - counter-increment
 PASS <ol type="A" class="type-A"> - text-align
 PASS <li type="A" class="type-A"> - display
 PASS <li type="A" class="type-A"> - margin-top
@@ -1201,7 +1201,7 @@
 PASS <ol type="i" class="type-i"> - list-style-type
 PASS <ol type="i" class="type-i"> - counter-set
 FAIL <ol type="i" class="type-i"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="i" class="type-i"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="i" class="type-i"> - counter-increment
 PASS <ol type="i" class="type-i"> - text-align
 PASS <li type="i" class="type-i"> - display
 PASS <li type="i" class="type-i"> - margin-top
@@ -1229,7 +1229,7 @@
 PASS <ol type="I" class="type-I"> - list-style-type
 PASS <ol type="I" class="type-I"> - counter-set
 FAIL <ol type="I" class="type-I"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="I" class="type-I"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="I" class="type-I"> - counter-increment
 PASS <ol type="I" class="type-I"> - text-align
 PASS <li type="I" class="type-I"> - display
 PASS <li type="I" class="type-I"> - margin-top
@@ -1257,7 +1257,7 @@
 FAIL <ol type="none"> - list-style-type assert_equals: expected "none" but got "decimal"
 PASS <ol type="none"> - counter-set
 FAIL <ol type="none"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="none"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="none"> - counter-increment
 PASS <ol type="none"> - text-align
 PASS <li type="none"> - display
 PASS <li type="none"> - margin-top
@@ -1285,7 +1285,7 @@
 FAIL <ol type="NONE"> - list-style-type assert_equals: expected "none" but got "decimal"
 PASS <ol type="NONE"> - counter-set
 FAIL <ol type="NONE"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="NONE"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="NONE"> - counter-increment
 PASS <ol type="NONE"> - text-align
 PASS <li type="NONE"> - display
 PASS <li type="NONE"> - margin-top
@@ -1313,7 +1313,7 @@
 FAIL <ol type="disc"> - list-style-type assert_equals: expected "disc" but got "decimal"
 PASS <ol type="disc"> - counter-set
 FAIL <ol type="disc"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="disc"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="disc"> - counter-increment
 PASS <ol type="disc"> - text-align
 PASS <li type="disc"> - display
 PASS <li type="disc"> - margin-top
@@ -1341,7 +1341,7 @@
 FAIL <ol type="DISC"> - list-style-type assert_equals: expected "disc" but got "decimal"
 PASS <ol type="DISC"> - counter-set
 FAIL <ol type="DISC"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="DISC"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="DISC"> - counter-increment
 PASS <ol type="DISC"> - text-align
 PASS <li type="DISC"> - display
 PASS <li type="DISC"> - margin-top
@@ -1369,7 +1369,7 @@
 FAIL <ol type="circle"> - list-style-type assert_equals: expected "circle" but got "decimal"
 PASS <ol type="circle"> - counter-set
 FAIL <ol type="circle"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="circle"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="circle"> - counter-increment
 PASS <ol type="circle"> - text-align
 PASS <li type="circle"> - display
 PASS <li type="circle"> - margin-top
@@ -1397,7 +1397,7 @@
 FAIL <ol type="CIRCLE"> - list-style-type assert_equals: expected "circle" but got "decimal"
 PASS <ol type="CIRCLE"> - counter-set
 FAIL <ol type="CIRCLE"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="CIRCLE"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="CIRCLE"> - counter-increment
 PASS <ol type="CIRCLE"> - text-align
 PASS <li type="CIRCLE"> - display
 PASS <li type="CIRCLE"> - margin-top
@@ -1425,7 +1425,7 @@
 FAIL <ol type="square"> - list-style-type assert_equals: expected "square" but got "decimal"
 PASS <ol type="square"> - counter-set
 FAIL <ol type="square"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="square"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="square"> - counter-increment
 PASS <ol type="square"> - text-align
 PASS <li type="square"> - display
 PASS <li type="square"> - margin-top
@@ -1453,7 +1453,7 @@
 FAIL <ol type="SQUARE"> - list-style-type assert_equals: expected "square" but got "decimal"
 PASS <ol type="SQUARE"> - counter-set
 FAIL <ol type="SQUARE"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol type="SQUARE"> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol type="SQUARE"> - counter-increment
 PASS <ol type="SQUARE"> - text-align
 PASS <li type="SQUARE"> - display
 PASS <li type="SQUARE"> - margin-top
@@ -1493,9 +1493,9 @@
     <li value="10"> - counter-set
 FAIL <ol>
     <li value="10"> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol>
-    <li value="10"> - counter-increment assert_equals: expected "list-item 0" but got "none"
 PASS <ol>
+    <li value="10"> - counter-increment
+PASS <ol>
     <li value="10"> - text-align
 PASS <li value="10"> (in <ol>) - display
 PASS <li value="10"> (in <ol>) - margin-top
@@ -1565,7 +1565,7 @@
 PASS <ol start="10"><li> - list-style-type
 PASS <ol start="10"><li> - counter-set
 FAIL <ol start="10"><li> - counter-reset assert_equals: expected "list-item 9" but got "none"
-FAIL <ol start="10"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol start="10"><li> - counter-increment
 PASS <ol start="10"><li> - text-align
 PASS <li> (in <ol start="10">) - display
 PASS <li> (in <ol start="10">) - margin-top
@@ -1593,7 +1593,7 @@
 PASS <ol start="10xyz"><li> - list-style-type
 PASS <ol start="10xyz"><li> - counter-set
 FAIL <ol start="10xyz"><li> - counter-reset assert_equals: expected "list-item 9" but got "none"
-FAIL <ol start="10xyz"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol start="10xyz"><li> - counter-increment
 PASS <ol start="10xyz"><li> - text-align
 PASS <li> (in <ol start="10xyz">) - display
 PASS <li> (in <ol start="10xyz">) - margin-top
@@ -1621,7 +1621,7 @@
 PASS <ol start="10e10"><li> - list-style-type
 PASS <ol start="10e10"><li> - counter-set
 FAIL <ol start="10e10"><li> - counter-reset assert_equals: expected "list-item 9" but got "none"
-FAIL <ol start="10e10"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol start="10e10"><li> - counter-increment
 PASS <ol start="10e10"><li> - text-align
 PASS <li> (in <ol start="10e10">) - display
 PASS <li> (in <ol start="10e10">) - margin-top
@@ -1649,7 +1649,7 @@
 PASS <ol start="xyz"><li> - list-style-type
 PASS <ol start="xyz"><li> - counter-set
 FAIL <ol start="xyz"><li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol start="xyz"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol start="xyz"><li> - counter-increment
 PASS <ol start="xyz"><li> - text-align
 PASS <li> (in <ol start="xyz">) - display
 PASS <li> (in <ol start="xyz">) - margin-top
@@ -1677,7 +1677,7 @@
 PASS <ol reversed=""><li> - list-style-type
 PASS <ol reversed=""><li> - counter-set
 FAIL <ol reversed=""><li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol reversed=""><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol reversed=""><li> - counter-increment
 PASS <ol reversed=""><li> - text-align
 PASS <li> (in <ol reversed="">) - display
 PASS <li> (in <ol reversed="">) - margin-top
@@ -1705,7 +1705,7 @@
 PASS <ol reversed="" start="20"><li> - list-style-type
 PASS <ol reversed="" start="20"><li> - counter-set
 FAIL <ol reversed="" start="20"><li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol reversed="" start="20"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol reversed="" start="20"><li> - counter-increment
 PASS <ol reversed="" start="20"><li> - text-align
 PASS <li> (in <ol reversed="" start="20">) - display
 PASS <li> (in <ol reversed="" start="20">) - margin-top
@@ -1733,7 +1733,7 @@
 PASS <ol reversed="" start="20xyz"><li> - list-style-type
 PASS <ol reversed="" start="20xyz"><li> - counter-set
 FAIL <ol reversed="" start="20xyz"><li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol reversed="" start="20xyz"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol reversed="" start="20xyz"><li> - counter-increment
 PASS <ol reversed="" start="20xyz"><li> - text-align
 PASS <li> (in <ol reversed="" start="20xyz">) - display
 PASS <li> (in <ol reversed="" start="20xyz">) - margin-top
@@ -1761,7 +1761,7 @@
 PASS <ol reversed="" start="20e10"><li> - list-style-type
 PASS <ol reversed="" start="20e10"><li> - counter-set
 FAIL <ol reversed="" start="20e10"><li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol reversed="" start="20e10"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol reversed="" start="20e10"><li> - counter-increment
 PASS <ol reversed="" start="20e10"><li> - text-align
 PASS <li> (in <ol reversed="" start="20e10">) - display
 PASS <li> (in <ol reversed="" start="20e10">) - margin-top
@@ -1789,7 +1789,7 @@
 PASS <ol reversed="" start="xyz"><li> - list-style-type
 PASS <ol reversed="" start="xyz"><li> - counter-set
 FAIL <ol reversed="" start="xyz"><li> - counter-reset assert_equals: expected "list-item 0" but got "none"
-FAIL <ol reversed="" start="xyz"><li> - counter-increment assert_equals: expected "list-item 0" but got "none"
+PASS <ol reversed="" start="xyz"><li> - counter-increment
 PASS <ol reversed="" start="xyz"><li> - text-align
 PASS <li> (in <ol reversed="" start="xyz">) - display
 PASS <li> (in <ol reversed="" start="xyz">) - margin-top

Modified: trunk/Source/WebCore/ChangeLog (291053 => 291054)


--- trunk/Source/WebCore/ChangeLog	2022-03-09 18:16:03 UTC (rev 291053)
+++ trunk/Source/WebCore/ChangeLog	2022-03-09 18:32:14 UTC (rev 291054)
@@ -1,3 +1,15 @@
+2022-03-09  Antoine Quint  <[email protected]>
+
+        [css-lists] css/css-lists/inherit-overwrites.html and css/css-lists/li-counter-increment-computed-style.html are unique failures
+        https://bugs.webkit.org/show_bug.cgi?id=237642
+
+        Reviewed by Antti Koivisto.
+
+        A std::nullopt means the property isn't set, not that it shoudl be 0.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::counterToCSSValue):
+
 2022-03-09  Simon Fraser  <[email protected]>
 
         Move RemoteLayerBackingStore::Buffer.isVolatile into ImageBufferBackend

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (291053 => 291054)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2022-03-09 18:16:03 UTC (rev 291053)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2022-03-09 18:32:14 UTC (rev 291054)
@@ -2079,11 +2079,16 @@
     auto& cssValuePool = CSSValuePool::singleton();
     auto list = CSSValueList::createSpaceSeparated();
     for (auto& keyValue : *map) {
-        list->append(cssValuePool.createCustomIdent(keyValue.key));
-        int number = (propertyID == CSSPropertyCounterIncrement ? keyValue.value.incrementValue : keyValue.value.resetValue).value_or(0);
-        list->append(cssValuePool.createValue(number, CSSUnitType::CSS_INTEGER));
+        if (auto number = (propertyID == CSSPropertyCounterIncrement ? keyValue.value.incrementValue : keyValue.value.resetValue)) {
+            list->append(cssValuePool.createCustomIdent(keyValue.key));
+            list->append(cssValuePool.createValue(*number, CSSUnitType::CSS_INTEGER));
+        }
     }
-    return list;
+
+    if (list->length())
+        return list;
+
+    return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
 }
 
 static Ref<CSSValueList> fontFamilyListFromStyle(const RenderStyle& style)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to