Diff
Modified: trunk/LayoutTests/ChangeLog (128077 => 128078)
--- trunk/LayoutTests/ChangeLog 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/LayoutTests/ChangeLog 2012-09-10 17:42:39 UTC (rev 128078)
@@ -1,3 +1,20 @@
+2012-09-04 Robert Hogan <[email protected]>
+
+ CSS 2.1 failure: content-counter-010.htm fails
+ https://bugs.webkit.org/show_bug.cgi?id=81447
+
+ Reviewed by Alexey Proskuryakov.
+
+ * fast/css/content-counter-010-expected.html: Added.
+ * fast/css/content-counter-010.htm: Added.
+ Note that <meta http-equiv="Content-Type" content="text/html; charset=utf-8" was added to the suite test
+ to allow it to render correctly from a file:/ url.
+ * fast/lists/w3-css3-lower-armenian-expected.txt:
+ * fast/lists/w3-css3-lower-armenian.html:
+ * fast/lists/w3-css3-upper-armenian-expected.txt:
+ * fast/lists/w3-css3-upper-armenian.html:
+ Amended tests to conform to revised specification for numbers between 7000 and 7999.
+
2012-09-10 Thiago Marcos P. Santos <[email protected]>
Font value should be parsed as a individual property
Added: trunk/LayoutTests/fast/css/content-counter-010-expected.html (0 => 128078)
--- trunk/LayoutTests/fast/css/content-counter-010-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/content-counter-010-expected.html 2012-09-10 17:42:39 UTC (rev 128078)
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>CSS Test: content: counter(c, armenian)</title>
+ <link rel="author" title="L. David Baron" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <meta http-equiv="Content-Style-Type" content="text/css">
+ <style type="text/css">
+
+ body { white-space: nowrap; }
+
+
+ #test { counter-reset: c; }
+ #test span { counter-increment: c; }
+ #test span:before { content: counter(c, armenian); }
+
+ </style>
+ </head>
+ <body>
+
+ <p>The following two lines should look the same:</p>
+
+ <div>
+ Ա
+ Բ
+ Գ
+ Դ
+ Ե
+ Զ
+ Է
+ Ը
+ Թ
+ Ժ
+ ԺԱ
+ ԺԲ
+ Ի
+ Լ
+ Խ
+ Ծ
+ Կ
+ Հ
+ Ձ
+ Ղ
+ Ճ
+ Մ
+ Յ
+ Ն
+ Շ
+ Ո
+ Չ
+ Պ
+ Ջ
+ Ռ
+ Ս
+ Վ
+ Տ
+ Ր
+ Ց
+ Ւ
+ Փ
+ Ք
+ ՔՋՂԹ
+ </div>
+
+ <div>
+ Ա
+ Բ
+ Գ
+ Դ
+ Ե
+ Զ
+ Է
+ Ը
+ Թ
+ Ժ
+ ԺԱ
+ ԺԲ
+ Ի
+ Լ
+ Խ
+ Ծ
+ Կ
+ Հ
+ Ձ
+ Ղ
+ Ճ
+ Մ
+ Յ
+ Ն
+ Շ
+ Ո
+ Չ
+ Պ
+ Ջ
+ Ռ
+ Ս
+ Վ
+ Տ
+ Ր
+ Ց
+ Ւ
+ Փ
+ Ք
+ ՔՋՂԹ
+ </div>
+
+ </body>
+</html>
Property changes on: trunk/LayoutTests/fast/css/content-counter-010-expected.html
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/fast/css/content-counter-010.htm (0 => 128078)
--- trunk/LayoutTests/fast/css/content-counter-010.htm (rev 0)
+++ trunk/LayoutTests/fast/css/content-counter-010.htm 2012-09-10 17:42:39 UTC (rev 128078)
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>CSS Test: content: counter(c, armenian)</title>
+ <link rel="author" title="L. David Baron" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <link rel="help" href=""
+ <meta http-equiv="Content-Style-Type" content="text/css">
+ <style type="text/css">
+
+ body { white-space: nowrap; }
+
+
+ #test { counter-reset: c; }
+ #test span { counter-increment: c; }
+ #test span:before { content: counter(c, armenian); }
+
+ </style>
+ </head>
+ <body>
+
+ <p>The following two lines should look the same:</p>
+
+ <div id="test">
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <span style="counter-reset: c 19"></span>
+ <span style="counter-reset: c 29"></span>
+ <span style="counter-reset: c 39"></span>
+ <span style="counter-reset: c 49"></span>
+ <span style="counter-reset: c 59"></span>
+ <span style="counter-reset: c 69"></span>
+ <span style="counter-reset: c 79"></span>
+ <span style="counter-reset: c 89"></span>
+ <span style="counter-reset: c 99"></span>
+ <span style="counter-reset: c 199"></span>
+ <span style="counter-reset: c 299"></span>
+ <span style="counter-reset: c 399"></span>
+ <span style="counter-reset: c 499"></span>
+ <span style="counter-reset: c 599"></span>
+ <span style="counter-reset: c 699"></span>
+ <span style="counter-reset: c 799"></span>
+ <span style="counter-reset: c 899"></span>
+ <span style="counter-reset: c 999"></span>
+ <span style="counter-reset: c 1999"></span>
+ <span style="counter-reset: c 2999"></span>
+ <span style="counter-reset: c 3999"></span>
+ <span style="counter-reset: c 4999"></span>
+ <span style="counter-reset: c 5999"></span>
+ <span style="counter-reset: c 6999"></span>
+ <span style="counter-reset: c 7999"></span>
+ <span style="counter-reset: c 8999"></span>
+ <span style="counter-reset: c 9998"></span>
+ </div>
+
+ <span>
+ Ա
+ Բ
+ Գ
+ Դ
+ Ե
+ Զ
+ Է
+ Ը
+ Թ
+ Ժ
+ ԺԱ
+ ԺԲ
+ Ի
+ Լ
+ Խ
+ Ծ
+ Կ
+ Հ
+ Ձ
+ Ղ
+ Ճ
+ Մ
+ Յ
+ Ն
+ Շ
+ Ո
+ Չ
+ Պ
+ Ջ
+ Ռ
+ Ս
+ Վ
+ Տ
+ Ր
+ Ց
+ Ւ
+ Փ
+ Ք
+ ՔՋՂԹ
+ </span>
+
+ </body>
+</html>
Property changes on: trunk/LayoutTests/fast/css/content-counter-010.htm
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/LayoutTests/fast/lists/w3-css3-lower-armenian-expected.txt (128077 => 128078)
--- trunk/LayoutTests/fast/lists/w3-css3-lower-armenian-expected.txt 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/LayoutTests/fast/lists/w3-css3-lower-armenian-expected.txt 2012-09-10 17:42:39 UTC (rev 128078)
@@ -31,8 +31,8 @@
PASS list marker is ռպկ.
PASS list marker is ռպկե.
PASS list marker is րպկե.
-PASS list marker is ուե.
-PASS list marker is ուպ.
-PASS list marker is ուպկե.
+PASS list marker is ւե.
+PASS list marker is ւպ.
+PASS list marker is ւպկե.
PASS list marker is քջղթ.
Modified: trunk/LayoutTests/fast/lists/w3-css3-lower-armenian.html (128077 => 128078)
--- trunk/LayoutTests/fast/lists/w3-css3-lower-armenian.html 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/LayoutTests/fast/lists/w3-css3-lower-armenian.html 2012-09-10 17:42:39 UTC (rev 128078)
@@ -22,6 +22,7 @@
<body>
<h1>CSS3 Lower Armenian</h1>
<div id="description">This test was derived from Richard Ishida's test "lower-armenian, up to 9,999" listed at <a href="" (last updated 04/12/2010) and as it appeared when accessed on 11/16/2010. This test PASSED if the list item matches its bullet for every list item (below).
+ The test was updated under https://bugs.webkit.org/show_bug.cgi?id=81447 to reflect the revised rendering of numbers 7000-7999 which now begin with Ւ rather than ՈՒ.
<p>Distributed under both the <a href="" Test Suite License</a> and the <a href="" 3-clause BSD License</a>. To contribute to a W3C Test Suite, see the <a href="" and contribution forms</a>.</p>
</div>
<div class="test">
@@ -86,13 +87,13 @@
<li>րպկե</li>
</ol>
<ol class="lower-armenian" start="7005">
- <li>ուե</li>
+ <li>ւե</li>
</ol>
<ol class="lower-armenian" start="7800">
- <li>ուպ</li>
+ <li>ւպ</li>
</ol>
<ol class="lower-armenian" start="7865">
- <li>ուպկե</li>
+ <li>ւպկե</li>
</ol>
<ol class="lower-armenian" start="9999">
<li>քջղթ</li>
Modified: trunk/LayoutTests/fast/lists/w3-css3-upper-armenian-expected.txt (128077 => 128078)
--- trunk/LayoutTests/fast/lists/w3-css3-upper-armenian-expected.txt 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/LayoutTests/fast/lists/w3-css3-upper-armenian-expected.txt 2012-09-10 17:42:39 UTC (rev 128078)
@@ -31,8 +31,8 @@
PASS list marker is ՌՊԿ.
PASS list marker is ՌՊԿԵ.
PASS list marker is ՐՊԿԵ.
-PASS list marker is ՈՒԵ.
-PASS list marker is ՈՒՊ.
-PASS list marker is ՈՒՊԿԵ.
+PASS list marker is ՒԵ.
+PASS list marker is ՒՊ.
+PASS list marker is ՒՊԿԵ.
PASS list marker is ՔՋՂԹ.
Modified: trunk/LayoutTests/fast/lists/w3-css3-upper-armenian.html (128077 => 128078)
--- trunk/LayoutTests/fast/lists/w3-css3-upper-armenian.html 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/LayoutTests/fast/lists/w3-css3-upper-armenian.html 2012-09-10 17:42:39 UTC (rev 128078)
@@ -21,7 +21,8 @@
</head>
<body>
<h1>CSS3 Upper Armenian</h1>
- <div id="description">This test was derived from Richard Ishida's test "upper-armenian, up to 9,999" listed at <a href="" (last updated 04/12/2010) and as it appeared when accessed on 11/17/2010. This test PASSED if the list item matches its bullet for every list item (below).
+ <div id="description">This test was derived from Richard Ishida's test "upper-armenian, up to 9,999" listed at <a href="" (last updated 04/12/2010) and as it appeared when accessed on 11/17/2010. This test PASSED if the list item matches its bullet for every list item (below).
+ The test was updated under https://bugs.webkit.org/show_bug.cgi?id=81447 to reflect the revised rendering of numbers 7000-7999 which now begin with Ւ rather than ՈՒ.
<p>Distributed under both the <a href="" Test Suite License</a> and the <a href="" 3-clause BSD License</a>. To contribute to a W3C Test Suite, see the <a href="" and contribution forms</a>.</p>
</div>
<div class="test">
@@ -86,13 +87,13 @@
<li>ՐՊԿԵ</li>
</ol>
<ol class="upper-armenian" start="7005">
- <li>ՈՒԵ</li>
+ <li>ՒԵ</li>
</ol>
<ol class="upper-armenian" start="7800">
- <li>ՈՒՊ</li>
+ <li>ՒՊ</li>
</ol>
<ol class="upper-armenian" start="7865">
- <li>ՈՒՊԿԵ</li>
+ <li>ՒՊԿԵ</li>
</ol>
<ol class="upper-armenian" start="9999">
<li>ՔՋՂԹ</li>
Modified: trunk/Source/WebCore/ChangeLog (128077 => 128078)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 17:42:39 UTC (rev 128078)
@@ -1,3 +1,18 @@
+2012-09-04 Robert Hogan <[email protected]>
+
+ CSS 2.1 failure: content-counter-010.htm fails
+ https://bugs.webkit.org/show_bug.cgi?id=81447
+
+ Reviewed by Alexey Proskuryakov.
+
+ Test: fast/css/content-counter-010.htm
+
+ Per http://lists.w3.org/Archives/Public/public-css-testsuite/2010Nov/0064.html, the correct rendering of
+ 7000 to 7999 in Armenian changed in Nov 2010. Update implementation to match the revised spec.
+
+ * rendering/RenderListMarker.cpp:
+ (WebCore::toArmenianUnder10000):
+
2012-09-10 Thiago Marcos P. Santos <[email protected]>
Font value should be parsed as a individual property
Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (128077 => 128078)
--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2012-09-10 17:26:58 UTC (rev 128077)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2012-09-10 17:42:39 UTC (rev 128078)
@@ -222,7 +222,6 @@
if (int thousands = number / 1000) {
if (thousands == 7) {
- letters[length++] = 0x0548 + lowerOffset;
letters[length++] = 0x0552 + lowerOffset;
if (addCircumflex)
letters[length++] = 0x0302;
