[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
dbates at webkit.org
dbates at webkit.org
Wed Dec 22 18:00:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 690c9cb5c175c61f3d51cdd5d33de856e1ec93fd
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 5 05:12:21 2010 +0000
2010-12-04 Daniel Bates <dbates at rim.com>
Reviewed by Darin Adler.
Add support for lower-armenian and upper-armenian
https://bugs.webkit.org/show_bug.cgi?id=49641
Implement support for list-style-types lower-armenian and upper-armenian
for lowercase Armenian and uppercase Armenian numerals, respectively.
Tests: fast/lists/w3-css3-lower-armenian.html
fast/lists/w3-css3-upper-armenian.html
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added enum values LowerArmenian
and UpperArmenian.
* css/CSSValueKeywords.in: Added "upper-armenian" and "lower-armenian".
* inspector/front-end/SourceCSSTokenizer.re2js: Ditto.
* rendering/RenderListMarker.cpp:
(WebCore::effectiveListMarkerType): Added enum values LowerArmenian
and UpperArmenian.
(WebCore::listMarkerSuffix): Ditto.
(WebCore::listMarkerText): Ditto.
(WebCore::RenderListMarker::paint): Ditto.
(WebCore::RenderListMarker::computePreferredLogicalWidths): Ditto.
(WebCore::RenderListMarker::getRelativeMarkerRect): Ditto.
* rendering/style/RenderStyleConstants.h: Ditto.
2010-12-04 Daniel Bates <dbates at rim.com>
Reviewed by Darin Adler.
Add support for lower-armenian and upper-armenian
https://bugs.webkit.org/show_bug.cgi?id=49641
Tests cases for lower-armenian and upper-armenian list-style-types
derived from the HTML+CSS Internationalization Tests "lower-armenian, up to 9,999",
and "armenian, up to 9,999", respectively.
See <http://www.w3.org/International/tests/tests-html-css/list-lists>.
* fast/lists/w3-css3-lower-armenian-expected.txt: Added.
* fast/lists/w3-css3-lower-armenian.html: Added.
* fast/lists/w3-css3-upper-armenian-expected.txt: Added.
* fast/lists/w3-css3-upper-armenian.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73338 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8db0702..2c310ff 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-04 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Darin Adler.
+
+ Add support for lower-armenian and upper-armenian
+ https://bugs.webkit.org/show_bug.cgi?id=49641
+
+ Tests cases for lower-armenian and upper-armenian list-style-types
+ derived from the HTML+CSS Internationalization Tests "lower-armenian, up to 9,999",
+ and "armenian, up to 9,999", respectively.
+
+ See <http://www.w3.org/International/tests/tests-html-css/list-lists>.
+
+ * fast/lists/w3-css3-lower-armenian-expected.txt: Added.
+ * fast/lists/w3-css3-lower-armenian.html: Added.
+ * fast/lists/w3-css3-upper-armenian-expected.txt: Added.
+ * fast/lists/w3-css3-upper-armenian.html: Added.
+
2010-12-04 Gavin Peters <gavinp at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/fast/lists/w3-css3-lower-armenian-expected.txt b/LayoutTests/fast/lists/w3-css3-lower-armenian-expected.txt
new file mode 100644
index 0000000..c79d02e
--- /dev/null
+++ b/LayoutTests/fast/lists/w3-css3-lower-armenian-expected.txt
@@ -0,0 +1,38 @@
+CSS3 Lower Armenian
+
+lower-armenian
+
+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 ժ.
+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 շխ.
+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 ուե.
+PASS list marker is ուպ.
+PASS list marker is ուպկե.
+PASS list marker is քջղթ.
+
diff --git a/LayoutTests/fast/lists/w3-css3-lower-armenian.html b/LayoutTests/fast/lists/w3-css3-lower-armenian.html
new file mode 100644
index 0000000..d3ac9e4
--- /dev/null
+++ b/LayoutTests/fast/lists/w3-css3-lower-armenian.html
@@ -0,0 +1,102 @@
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <style>
+ ol { margin: 0; }
+ .lower-armenian { list-style-type: lower-armenian; }
+ </style>
+ <script src="resources/dump-list.js"></script>
+ <script>
+ function runTest()
+ {
+ if (!window.layoutTestController)
+ return;
+
+ layoutTestController.dumpAsText();
+ filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
+ document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
+ }
+ window.onload = runTest;
+ </script>
+</head>
+<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="http://www.w3.org/International/tests/tests-html-css/list-lists">http://www.w3.org/International/tests/tests-html-css/list-lists</a> (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).
+ <p>Distributed under both the <a href="http://www.w3.org/Consortium/Legal/2008/04-testsuite-license">W3C Test Suite License</a> and the <a href="http://www.w3.org/Consortium/Legal/2008/03-bsd-license">W3C 3-clause BSD License</a>. To contribute to a W3C Test Suite, see the <a href="http://www.w3.org/2004/10/27-testcases">policies and contribution forms</a>.</p>
+ </div>
+ <div class="test">
+ <h2>lower-armenian</h2>
+ <ol class="lower-armenian">
+ <li>ա</li>
+ <li>բ</li>
+ <li>գ</li>
+ <li>դ</li>
+ <li>ե</li>
+ <li>զ</li>
+ <li>է</li>
+ <li>ը</li>
+ <li>թ</li>
+ <li>ժ</li>
+ <li>ժա</li>
+ <li>ժբ</li>
+ </ol>
+ <ol class="lower-armenian" start="43">
+ <li>խգ</li>
+ </ol>
+ <ol class="lower-armenian" start="77">
+ <li>հէ</li>
+ </ol>
+ <ol class="lower-armenian" start="80">
+ <li>ձ</li>
+ </ol>
+ <ol class="lower-armenian" start="99">
+ <li>ղթ</li>
+ <li>ճ</li>
+ <li>ճա</li>
+ </ol>
+ <ol class="lower-armenian" start="222">
+ <li>միբ</li>
+ </ol>
+ <ol class="lower-armenian" start="540">
+ <li>շխ</li>
+ </ol>
+ <ol class="lower-armenian" start="999">
+ <li>ջղթ</li>
+ <li>ռ</li>
+ </ol>
+ <ol class="lower-armenian" start="1005">
+ <li>ռե</li>
+ </ol>
+ <ol class="lower-armenian" start="1060">
+ <li>ռկ</li>
+ </ol>
+ <ol class="lower-armenian" start="1065">
+ <li>ռկե</li>
+ </ol>
+ <ol class="lower-armenian" start="1800">
+ <li>ռպ</li>
+ </ol>
+ <ol class="lower-armenian" start="1860">
+ <li>ռպկ</li>
+ </ol>
+ <ol class="lower-armenian" start="1865">
+ <li>ռպկե</li>
+ </ol>
+ <ol class="lower-armenian" start="5865">
+ <li>րպկե</li>
+ </ol>
+ <ol class="lower-armenian" start="7005">
+ <li>ուե</li>
+ </ol>
+ <ol class="lower-armenian" start="7800">
+ <li>ուպ</li>
+ </ol>
+ <ol class="lower-armenian" start="7865">
+ <li>ուպկե</li>
+ </ol>
+ <ol class="lower-armenian" start="9999">
+ <li>քջղթ</li>
+ </ol>
+ </div>
+</body>
+</html>
diff --git a/LayoutTests/fast/lists/w3-css3-upper-armenian-expected.txt b/LayoutTests/fast/lists/w3-css3-upper-armenian-expected.txt
new file mode 100644
index 0000000..52e1204
--- /dev/null
+++ b/LayoutTests/fast/lists/w3-css3-upper-armenian-expected.txt
@@ -0,0 +1,38 @@
+CSS3 Upper Armenian
+
+upper-armenian
+
+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 Ժ.
+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 ՇԽ.
+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 ՈՒԵ.
+PASS list marker is ՈՒՊ.
+PASS list marker is ՈՒՊԿԵ.
+PASS list marker is ՔՋՂԹ.
+
diff --git a/LayoutTests/fast/lists/w3-css3-upper-armenian.html b/LayoutTests/fast/lists/w3-css3-upper-armenian.html
new file mode 100644
index 0000000..c1096b4
--- /dev/null
+++ b/LayoutTests/fast/lists/w3-css3-upper-armenian.html
@@ -0,0 +1,102 @@
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <style>
+ ol { margin: 0; }
+ .upper-armenian { list-style-type: upper-armenian; }
+ </style>
+ <script src="resources/dump-list.js"></script>
+ <script>
+ function runTest()
+ {
+ if (!window.layoutTestController)
+ return;
+
+ layoutTestController.dumpAsText();
+ filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
+ document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
+ }
+ window.onload = runTest;
+ </script>
+</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="http://www.w3.org/International/tests/tests-html-css/list-lists">http://www.w3.org/International/tests/tests-html-css/list-lists</a> (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).
+ <p>Distributed under both the <a href="http://www.w3.org/Consortium/Legal/2008/04-testsuite-license">W3C Test Suite License</a> and the <a href="http://www.w3.org/Consortium/Legal/2008/03-bsd-license">W3C 3-clause BSD License</a>. To contribute to a W3C Test Suite, see the <a href="http://www.w3.org/2004/10/27-testcases">policies and contribution forms</a>.</p>
+ </div>
+ <div class="test">
+ <h2>upper-armenian</h2>
+ <ol class="upper-armenian">
+ <li>Ա</li>
+ <li>Բ</li>
+ <li>Գ</li>
+ <li>Դ</li>
+ <li>Ե</li>
+ <li>Զ</li>
+ <li>Է</li>
+ <li>Ը</li>
+ <li>Թ</li>
+ <li>Ժ</li>
+ <li>ԺԱ</li>
+ <li>ԺԲ</li>
+ </ol>
+ <ol class="upper-armenian" start="43">
+ <li>ԽԳ</li>
+ </ol>
+ <ol class="upper-armenian" start="77">
+ <li>ՀԷ</li>
+ </ol>
+ <ol class="upper-armenian" start="80">
+ <li>Ձ</li>
+ </ol>
+ <ol class="upper-armenian" start="99">
+ <li>ՂԹ</li>
+ <li>Ճ</li>
+ <li>ՃԱ</li>
+ </ol>
+ <ol class="upper-armenian" start="222">
+ <li>ՄԻԲ</li>
+ </ol>
+ <ol class="upper-armenian" start="540">
+ <li>ՇԽ</li>
+ </ol>
+ <ol class="upper-armenian" start="999">
+ <li>ՋՂԹ</li>
+ <li>Ռ</li>
+ </ol>
+ <ol class="upper-armenian" start="1005">
+ <li>ՌԵ</li>
+ </ol>
+ <ol class="upper-armenian" start="1060">
+ <li>ՌԿ</li>
+ </ol>
+ <ol class="upper-armenian" start="1065">
+ <li>ՌԿԵ</li>
+ </ol>
+ <ol class="upper-armenian" start="1800">
+ <li>ՌՊ</li>
+ </ol>
+ <ol class="upper-armenian" start="1860">
+ <li>ՌՊԿ</li>
+ </ol>
+ <ol class="upper-armenian" start="1865">
+ <li>ՌՊԿԵ</li>
+ </ol>
+ <ol class="upper-armenian" start="5865">
+ <li>ՐՊԿԵ</li>
+ </ol>
+ <ol class="upper-armenian" start="7005">
+ <li>ՈՒԵ</li>
+ </ol>
+ <ol class="upper-armenian" start="7800">
+ <li>ՈՒՊ</li>
+ </ol>
+ <ol class="upper-armenian" start="7865">
+ <li>ՈՒՊԿԵ</li>
+ </ol>
+ <ol class="upper-armenian" start="9999">
+ <li>ՔՋՂԹ</li>
+ </ol>
+ </div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b8f335b..b405787 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2010-12-04 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Darin Adler.
+
+ Add support for lower-armenian and upper-armenian
+ https://bugs.webkit.org/show_bug.cgi?id=49641
+
+ Implement support for list-style-types lower-armenian and upper-armenian
+ for lowercase Armenian and uppercase Armenian numerals, respectively.
+
+ Tests: fast/lists/w3-css3-lower-armenian.html
+ fast/lists/w3-css3-upper-armenian.html
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added enum values LowerArmenian
+ and UpperArmenian.
+ * css/CSSValueKeywords.in: Added "upper-armenian" and "lower-armenian".
+ * inspector/front-end/SourceCSSTokenizer.re2js: Ditto.
+ * rendering/RenderListMarker.cpp:
+ (WebCore::effectiveListMarkerType): Added enum values LowerArmenian
+ and UpperArmenian.
+ (WebCore::listMarkerSuffix): Ditto.
+ (WebCore::listMarkerText): Ditto.
+ (WebCore::RenderListMarker::paint): Ditto.
+ (WebCore::RenderListMarker::computePreferredLogicalWidths): Ditto.
+ (WebCore::RenderListMarker::getRelativeMarkerRect): Ditto.
+ * rendering/style/RenderStyleConstants.h: Ditto.
+
2010-12-04 Dan Bernstein <mitz at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/css/CSSPrimitiveValueMappings.h b/WebCore/css/CSSPrimitiveValueMappings.h
index c209bc0..177a97e 100644
--- a/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/WebCore/css/CSSPrimitiveValueMappings.h
@@ -1137,6 +1137,9 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EListStyleType e)
case LowerAlpha:
m_value.ident = CSSValueLowerAlpha;
break;
+ case LowerArmenian:
+ m_value.ident = CSSValueLowerArmenian;
+ break;
case LowerGreek:
m_value.ident = CSSValueLowerGreek;
break;
@@ -1212,6 +1215,9 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EListStyleType e)
case UpperAlpha:
m_value.ident = CSSValueUpperAlpha;
break;
+ case UpperArmenian:
+ m_value.ident = CSSValueUpperArmenian;
+ break;
case UpperGreek:
m_value.ident = CSSValueUpperGreek;
break;
diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index bd07fca..f733ee2 100644
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -292,6 +292,8 @@ asterisks
footnotes
hebrew
armenian
+lower-armenian
+upper-armenian
georgian
cjk-ideographic
hiragana
diff --git a/WebCore/inspector/front-end/SourceCSSTokenizer.re2js b/WebCore/inspector/front-end/SourceCSSTokenizer.re2js
index f4628d2..a8d289b 100644
--- a/WebCore/inspector/front-end/SourceCSSTokenizer.re2js
+++ b/WebCore/inspector/front-end/SourceCSSTokenizer.re2js
@@ -67,10 +67,10 @@ WebInspector.SourceCSSTokenizer = function()
"inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite", "infobackground", "infotext", "inherit", "initial", "inline",
"inline-axis", "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert", "italic", "justify", "kannada", "katakana",
"katakana-iroha", "khmer", "landscape", "lao", "large", "larger", "left", "level", "lighter", "lime", "line-through", "linear", "lines",
- "list-button", "list-item", "listbox", "listitem", "local", "logical", "loud", "lower", "lower-alpha", "lower-greek", "lower-hexadecimal", "lower-latin",
- "lower-norwegian", "lower-roman", "lowercase", "ltr", "malayalam", "maroon", "match", "media-controls-background", "media-current-time-display",
- "media-fullscreen-button", "media-mute-button", "media-play-button", "media-return-to-realtime-button", "media-rewind-button",
- "media-seek-back-button", "media-seek-forward-button", "media-slider", "media-sliderthumb", "media-time-remaining-display",
+ "list-button", "list-item", "listbox", "listitem", "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian", "lower-greek",
+ "lower-hexadecimal", "lower-latin", "lower-norwegian", "lower-roman", "lowercase", "ltr", "malayalam", "maroon", "match", "media-controls-background",
+ "media-current-time-display", "media-fullscreen-button", "media-mute-button", "media-play-button", "media-return-to-realtime-button",
+ "media-rewind-button", "media-seek-back-button", "media-seek-forward-button", "media-slider", "media-sliderthumb", "media-time-remaining-display",
"media-volume-slider", "media-volume-slider-container", "media-volume-sliderthumb", "medium", "menu", "menulist", "menulist-button",
"menulist-text", "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic", "mix", "mongolian", "monospace", "move", "multiple",
"myanmar", "n-resize", "narrower", "navy", "ne-resize", "nesw-resize", "no-close-quote", "no-drop", "no-open-quote", "no-repeat", "none",
@@ -87,8 +87,8 @@ WebInspector.SourceCSSTokenizer = function()
"sw-resize", "table", "table-caption", "table-cell", "table-column", "table-column-group", "table-footer-group", "table-header-group",
"table-row", "table-row-group", "teal", "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai", "thick", "thin",
"threeddarkshadow", "threedface", "threedhighlight", "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er", "tigrinya-er-abegede",
- "tigrinya-et", "tigrinya-et-abegede", "to", "top", "transparent", "ultra-condensed", "ultra-expanded", "underline", "up", "upper-alpha", "upper-greek",
- "upper-hexadecimal", "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url", "vertical", "vertical-text", "visible",
+ "tigrinya-et", "tigrinya-et-abegede", "to", "top", "transparent", "ultra-condensed", "ultra-expanded", "underline", "up", "upper-alpha", "upper-armenian",
+ "upper-greek", "upper-hexadecimal", "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url", "vertical", "vertical-text", "visible",
"visibleFill", "visiblePainted", "visibleStroke", "visual", "w-resize", "wait", "wave", "white", "wider", "window", "windowframe", "windowtext",
"x-large", "x-small", "xor", "xx-large", "xx-small", "yellow", "-wap-marquee", "-webkit-activelink", "-webkit-auto", "-webkit-baseline-middle",
"-webkit-body", "-webkit-box", "-webkit-center", "-webkit-control", "-webkit-focus-ring-color", "-webkit-grab", "-webkit-grabbing",
diff --git a/WebCore/rendering/RenderListMarker.cpp b/WebCore/rendering/RenderListMarker.cpp
index 2f33afb..d48ab26 100644
--- a/WebCore/rendering/RenderListMarker.cpp
+++ b/WebCore/rendering/RenderListMarker.cpp
@@ -467,6 +467,7 @@ static EListStyleType effectiveListMarkerType(EListStyleType type, int value)
case Katakana:
case KatakanaIroha:
case LowerAlpha:
+ case LowerArmenian:
case LowerGreek:
case LowerLatin:
case LowerNorwegian:
@@ -479,6 +480,7 @@ static EListStyleType effectiveListMarkerType(EListStyleType type, int value)
case TigrinyaEt:
case TigrinyaEtAbegede:
case UpperAlpha:
+ case UpperArmenian:
case UpperGreek:
case UpperLatin:
case UpperNorwegian:
@@ -558,6 +560,7 @@ static UChar listMarkerSuffix(EListStyleType type, int value)
case Khmer:
case Lao:
case LowerAlpha:
+ case LowerArmenian:
case LowerGreek:
case LowerHexadecimal:
case LowerLatin:
@@ -573,6 +576,7 @@ static UChar listMarkerSuffix(EListStyleType type, int value)
case Thai:
case Tibetan:
case UpperAlpha:
+ case UpperArmenian:
case UpperGreek:
case UpperHexadecimal:
case UpperLatin:
@@ -1020,10 +1024,13 @@ String listMarkerText(EListStyleType type, int value)
return toRoman(value, true);
case Armenian:
+ case UpperArmenian:
// CSS3 says "armenian" means "lower-armenian".
// But the CSS2.1 test suite contains uppercase test results for "armenian",
// so we'll match the test suite.
return toArmenian(value, true);
+ case LowerArmenian:
+ return toArmenian(value, false);
case Georgian:
return toGeorgian(value);
case Hebrew:
@@ -1207,6 +1214,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty)
case Khmer:
case Lao:
case LowerAlpha:
+ case LowerArmenian:
case LowerGreek:
case LowerHexadecimal:
case LowerLatin:
@@ -1230,6 +1238,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty)
case TigrinyaEt:
case TigrinyaEtAbegede:
case UpperAlpha:
+ case UpperArmenian:
case UpperGreek:
case UpperHexadecimal:
case UpperLatin:
@@ -1409,6 +1418,7 @@ void RenderListMarker::computePreferredLogicalWidths()
case Khmer:
case Lao:
case LowerAlpha:
+ case LowerArmenian:
case LowerGreek:
case LowerHexadecimal:
case LowerLatin:
@@ -1432,6 +1442,7 @@ void RenderListMarker::computePreferredLogicalWidths()
case TigrinyaEt:
case TigrinyaEtAbegede:
case UpperAlpha:
+ case UpperArmenian:
case UpperGreek:
case UpperHexadecimal:
case UpperLatin:
@@ -1631,6 +1642,7 @@ IntRect RenderListMarker::getRelativeMarkerRect()
case Khmer:
case Lao:
case LowerAlpha:
+ case LowerArmenian:
case LowerGreek:
case LowerHexadecimal:
case LowerLatin:
@@ -1654,6 +1666,7 @@ IntRect RenderListMarker::getRelativeMarkerRect()
case TigrinyaEt:
case TigrinyaEtAbegede:
case UpperAlpha:
+ case UpperArmenian:
case UpperGreek:
case UpperHexadecimal:
case UpperLatin:
diff --git a/WebCore/rendering/style/RenderStyleConstants.h b/WebCore/rendering/style/RenderStyleConstants.h
index cc99d92..8dbce8e 100644
--- a/WebCore/rendering/style/RenderStyleConstants.h
+++ b/WebCore/rendering/style/RenderStyleConstants.h
@@ -290,6 +290,8 @@ enum EListStyleType {
Footnotes,
Hebrew,
Armenian,
+ LowerArmenian,
+ UpperArmenian,
Georgian,
CJKIdeographic,
Hiragana,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list