<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[278648] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/278648">278648</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-08 22:07:27 -0700 (Tue, 08 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>CSSOM test for serializing counter() fails
https://bugs.webkit.org/show_bug.cgi?id=184256

Patch by Rob Buis <rbuis@igalia.com> on 2021-06-08
Reviewed by Sam Weinig.

LayoutTests/imported/w3c:

Update improved test result.

* web-platform-tests/css/cssom/serialize-values-expected.txt:

Source/WebCore:

The last CSS component value should be omitted if it is "decimal" [1].

Behavior matches Firefox and Chrome.

[1] https://drafts.csswg.org/cssom/#serialize-a-css-component-value

* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText const):

LayoutTests:

Adapt to serialization change.

* fast/css/counters/counter-cssText-expected.txt:
* fast/css/counters/counter-cssText.html:
* fast/css/serialization-with-double-quotes-expected.txt:
* fast/css/serialization-with-double-quotes.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcsscounterscountercssTextexpectedtxt">trunk/LayoutTests/fast/css/counters/counter-cssText-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscounterscountercssTexthtml">trunk/LayoutTests/fast/css/counters/counter-cssText.html</a></li>
<li><a href="#trunkLayoutTestsfastcssserializationwithdoublequotesexpectedtxt">trunk/LayoutTests/fast/css/serialization-with-double-quotes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssserializationwithdoublequoteshtml">trunk/LayoutTests/fast/css/serialization-with-double-quotes.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssomserializevaluesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/serialize-values-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/ChangeLog 2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-08  Rob Buis  <rbuis@igalia.com>
+
+        CSSOM test for serializing counter() fails
+        https://bugs.webkit.org/show_bug.cgi?id=184256
+
+        Reviewed by Sam Weinig.
+
+        Adapt to serialization change.
+
+        * fast/css/counters/counter-cssText-expected.txt:
+        * fast/css/counters/counter-cssText.html:
+        * fast/css/serialization-with-double-quotes-expected.txt:
+        * fast/css/serialization-with-double-quotes.html:
+
</ins><span class="cx"> 2021-06-08  Diego Pino Garcia  <dpino@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] Unreviewed test gardening. Update test expectation status of imported/w3c/web-platform-tests/media-source/mediasource-changetype-play.html.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscounterscountercssTextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/counters/counter-cssText-expected.txt (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/counters/counter-cssText-expected.txt 2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/fast/css/counters/counter-cssText-expected.txt    2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS rules[2].style.cssText is "content: counter(section, decimal);"
-PASS rules[3].style.cssText is "content: counters(section, \":\", decimal);"
</del><ins>+PASS rules[2].style.cssText is "content: counter(section);"
+PASS rules[3].style.cssText is "content: counters(section, \":\");"
</ins><span class="cx"> PASS rules[4].style.cssText is "content: counter(section, lower-roman);"
</span><span class="cx"> PASS rules[5].style.cssText is "content: counters(section, \",\", upper-roman);"
</span><span class="cx"> PASS rules[6].style.cssText is "content: counter(section, none);"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscounterscountercssTexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/counters/counter-cssText.html (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/counters/counter-cssText.html 2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/fast/css/counters/counter-cssText.html    2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> <script>
</span><span class="cx"> description("Test the cssText output of counter-valued CSSPrimitiveValues");
</span><span class="cx"> var rules = document.styleSheets[0].cssRules;
</span><del>-shouldBeEqualToString("rules[2].style.cssText", `content: counter(section, decimal);`);
-shouldBeEqualToString("rules[3].style.cssText", `content: counters(section, ":", decimal);`);
</del><ins>+shouldBeEqualToString("rules[2].style.cssText", `content: counter(section);`);
+shouldBeEqualToString("rules[3].style.cssText", `content: counters(section, ":");`);
</ins><span class="cx"> shouldBeEqualToString("rules[4].style.cssText", `content: counter(section, lower-roman);`);
</span><span class="cx"> shouldBeEqualToString("rules[5].style.cssText", `content: counters(section, ",", upper-roman);`);
</span><span class="cx"> shouldBeEqualToString("rules[6].style.cssText", `content: counter(section, none);`);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssserializationwithdoublequotesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/serialization-with-double-quotes-expected.txt (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/serialization-with-double-quotes-expected.txt 2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/fast/css/serialization-with-double-quotes-expected.txt    2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> PASS parsed = eval(value.replace(/^'/, "").replace(/'$/, "")); is "{foo: \"bar\"}"
</span><span class="cx"> PASS ruleWithAttributeSelector.selectorText is "span[class=\"foo bar\"]"
</span><span class="cx"> PASS getComputedStyle(document.querySelector("span[class='foo bar']")).getPropertyValue("color") is "rgb(0, 128, 0)"
</span><del>-PASS counterRule.style.content is "counters(section, \".\", decimal)"
</del><ins>+PASS counterRule.style.content is "counters(section, \".\")"
</ins><span class="cx"> PASS fontFamilyRule.style.fontFamily is "\"Two Infinite Loop\", \"Cupertino CA\""
</span><span class="cx"> PASS getComputedStyle(document.querySelector("article")).getPropertyValue("font-family") is "\"Two Infinite Loop\", \"Cupertino CA\""
</span><span class="cx"> PASS backgroundImageRule.style.backgroundImage is "url(\"data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='100px' height='100px'><rect width='100px' height='100px' fill='lightgreen' stroke='green' stroke-width='1px'/></svg>\")"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssserializationwithdoublequoteshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/serialization-with-double-quotes.html (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/serialization-with-double-quotes.html 2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/fast/css/serialization-with-double-quotes.html    2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> shouldBeEqualToString(`getComputedStyle(document.querySelector("span[class='foo bar']")).getPropertyValue("color")`, 'rgb(0, 128, 0)');
</span><span class="cx"> 
</span><span class="cx"> var counterRule = styleSheet.rules[4];
</span><del>-shouldBeEqualToString('counterRule.style.content', 'counters(section, ".", decimal)');
</del><ins>+shouldBeEqualToString('counterRule.style.content', 'counters(section, ".")');
</ins><span class="cx"> 
</span><span class="cx"> var fontFamilyRule = styleSheet.rules[5];
</span><span class="cx"> shouldBeEqualToString('fontFamilyRule.style.fontFamily', '"Two Infinite Loop", "Cupertino CA"');
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-06-08  Rob Buis  <rbuis@igalia.com>
+
+        CSSOM test for serializing counter() fails
+        https://bugs.webkit.org/show_bug.cgi?id=184256
+
+        Reviewed by Sam Weinig.
+
+        Update improved test result.
+
+        * web-platform-tests/css/cssom/serialize-values-expected.txt:
+
</ins><span class="cx"> 2021-06-08  Truitt Savell  <tsavell@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reverting r278609.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssomserializevaluesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/serialize-values-expected.txt (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/serialize-values-expected.txt        2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/serialize-values-expected.txt   2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -319,8 +319,8 @@
</span><span class="cx"> PASS content: 'string'
</span><span class="cx"> PASS content: url("http://localhost/")
</span><span class="cx"> PASS content: url(http://localhost/)
</span><del>-FAIL content: counter(par-num) assert_equals: content raw inline style declaration expected "counter(par-num)" but got "counter(par-num, decimal)"
-FAIL content: counter(par-num, decimal) assert_equals: content raw inline style declaration expected "counter(par-num)" but got "counter(par-num, decimal)"
</del><ins>+PASS content: counter(par-num)
+PASS content: counter(par-num, decimal)
</ins><span class="cx"> PASS content: counter(par-num, upper-roman)
</span><span class="cx"> PASS content: attr(foo-bar)
</span><span class="cx"> PASS content: attr(foo_bar)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/Source/WebCore/ChangeLog      2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-06-08  Rob Buis  <rbuis@igalia.com>
+
+        CSSOM test for serializing counter() fails
+        https://bugs.webkit.org/show_bug.cgi?id=184256
+
+        Reviewed by Sam Weinig.
+
+        The last CSS component value should be omitted if it is "decimal" [1].
+
+        Behavior matches Firefox and Chrome.
+
+        [1] https://drafts.csswg.org/cssom/#serialize-a-css-component-value
+
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText const):
+
</ins><span class="cx"> 2021-06-08  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Adopt WTF::Span in SQLiteStatement
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (278647 => 278648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp   2021-06-09 05:03:32 UTC (rev 278647)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp      2021-06-09 05:07:27 UTC (rev 278648)
</span><span class="lines">@@ -1080,7 +1080,9 @@
</span><span class="cx">         result.append(separator.isEmpty() ? "counter(" : "counters(", m_value.counter->identifier(), separator.isEmpty() ? "" : ", ");
</span><span class="cx">         if (!separator.isEmpty())
</span><span class="cx">             serializeString(separator, result);
</span><del>-        result.append(listStyle.isEmpty() ? "" : ", ", listStyle, ')');
</del><ins>+        if (!(listStyle.isEmpty() || listStyle == "decimal"))
+            result.append(", ", listStyle);
+        result.append(')');
</ins><span class="cx">         return result.toString();
</span><span class="cx">     }
</span><span class="cx">     case CSSUnitType::CSS_RECT:
</span></span></pre>
</div>
</div>

</body>
</html>