Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 985825 - Unprefix -moz-ethiopic-numeric. r=jfkthame

Browse Source
This commit is contained in:
Xidorn Quan 2014-06-13 17:37:00 +02:00
parent 603c17d06a
commit a84079e422
9 changed files with 110 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
layout/reftests/counters/counter-ethiopic-numeric-ref.html Normal file
View File

@ -0,0 +1,47 @@
<!DOCTYPE html>
<style type="text/css">
div {
float: left;
padding: .5em;
}
</style>
<div>&#x1369;</div>
<div>&#x136a;</div>
<div>&#x136b;</div>
<div>&#x136c;</div>
<div>&#x136d;</div>
<div>&#x136e;</div>
<div>&#x136f;</div>
<div>&#x1370;</div>
<div>&#x1371;</div>
<div>&#x1372;</div>
<div>&#x1372;&#x1369;</div>
<div>&#x1372;&#x136a;</div>
<div>&#x1375;&#x136b;</div>
<div>&#x1378;&#x136f;</div>
<div>&#x1379;</div>
<div>&#x137a;&#x1371;</div>
<div>&#x137b;</div>
<div>&#x137b;&#x1369;</div>
<div>&#x136a;&#x137b;&#x1373;&#x136a;</div>
<div>&#x136d;&#x137b;&#x1375;</div>
<div>&#x1371;&#x137b;&#x137a;&#x1371;</div>
<div>&#x1372;&#x137b;</div>
<div>&#x1372;&#x137b;&#x136d;</div>
<div>&#x1372;&#x137b;&#x1377;</div>
<div>&#x1372;&#x137b;&#x1377;&#x136d;</div>
<div>&#x1372;&#x1370;&#x137b;</div>
<div>&#x1372;&#x1370;&#x137b;&#x1377;</div>
<div>&#x1372;&#x1370;&#x137b;&#x1377;&#x136d;</div>
<div>&#x1376;&#x1370;&#x137b;&#x1377;&#x136d;</div>
<div>&#x1378;&#x137b;&#x136d;</div>
<div>&#x1378;&#x1370;&#x137b;</div>
<div>&#x1378;&#x1370;&#x137b;&#x1377;&#x136c;</div>
<div>&#x137a;&#x1371;&#x137b;&#x137a;&#x1371;</div>
<div>&#x137c;</div>
<div>&#x137b;&#x137c;&#x1369;</div>
<div>&#x1378;&#x1370;&#x137b;&#x1369;&#x137c;&#x137a;&#x136a;</div>
<div>0</div>
<div>-1</div>

50
layout/reftests/counters/counter-ethiopic-numeric.html Normal file
View File

@ -0,0 +1,50 @@
<!DOCTYPE html>
<style type="text/css">
div {
float: left;
padding: .5em;
}
div::after {
content: counter(n, ethiopic-numeric);
}
</style>
<div style="counter-reset: n 1;"></div>
<div style="counter-reset: n 2;"></div>
<div style="counter-reset: n 3;"></div>
<div style="counter-reset: n 4;"></div>
<div style="counter-reset: n 5;"></div>
<div style="counter-reset: n 6;"></div>
<div style="counter-reset: n 7;"></div>
<div style="counter-reset: n 8;"></div>
<div style="counter-reset: n 9;"></div>
<div style="counter-reset: n 10;"></div>
<div style="counter-reset: n 11;"></div>
<div style="counter-reset: n 12;"></div>
<div style="counter-reset: n 43;"></div>
<div style="counter-reset: n 77;"></div>
<div style="counter-reset: n 80;"></div>
<div style="counter-reset: n 99;"></div>
<div style="counter-reset: n 100;"></div>
<div style="counter-reset: n 101;"></div>
<div style="counter-reset: n 222;"></div>
<div style="counter-reset: n 540;"></div>
<div style="counter-reset: n 999;"></div>
<div style="counter-reset: n 1000;"></div>
<div style="counter-reset: n 1005;"></div>
<div style="counter-reset: n 1060;"></div>
<div style="counter-reset: n 1065;"></div>
<div style="counter-reset: n 1800;"></div>
<div style="counter-reset: n 1860;"></div>
<div style="counter-reset: n 1865;"></div>
<div style="counter-reset: n 5865;"></div>
<div style="counter-reset: n 7005;"></div>
<div style="counter-reset: n 7800;"></div>
<div style="counter-reset: n 7864;"></div>
<div style="counter-reset: n 9999;"></div>
<div style="counter-reset: n 10000;"></div>
<div style="counter-reset: n 1000001;"></div>
<div style="counter-reset: n 78010092;"></div>
<div style="counter-reset: n 0;"></div>
<div style="counter-reset: n -1;"></div>

1
layout/reftests/counters/reftest.list
View File

@ -79,3 +79,4 @@ fails-if(xulRuntime.XPCOMABI.match(/arm/)) == counter-ua-limits-02.html counter-
== counter-simp-chinese-formal.html counter-simp-chinese-formal-ref.html
== counter-trad-chinese-informal.html counter-trad-chinese-informal-ref.html
== counter-trad-chinese-formal.html counter-trad-chinese-formal-ref.html
== counter-ethiopic-numeric.html counter-ethiopic-numeric-ref.html

6
layout/style/CounterStyleManager.cpp
View File

@ -770,7 +770,7 @@ BuiltinCounterStyle::IsOrdinalInRange(CounterValue aOrdinal)
return true;
// use EthiopicToText
case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_NUMERIC:
case NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC:
return aOrdinal >= 1;
// use HebrewToText
@ -812,7 +812,7 @@ BuiltinCounterStyle::IsOrdinalInAutoRange(CounterValue aOrdinal)
case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL:
case NS_STYLE_LIST_STYLE_SIMP_CHINESE_INFORMAL:
case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_NUMERIC:
case NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC:
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
return IsOrdinalInRange(aOrdinal);
@ -948,7 +948,7 @@ BuiltinCounterStyle::GetInitialCounterText(CounterValue aOrdinal,
case NS_STYLE_LIST_STYLE_MOZ_TAMIL:
return TamilToText(aOrdinal, aResult);
case NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_NUMERIC:
case NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC:
return EthiopicToText(aOrdinal, aResult);
default:

4
layout/style/counterstyles.css
View File

@ -263,3 +263,7 @@
@counter-style -moz-japanese-formal {
system: extends japanese-formal;
}
@counter-style -moz-ethiopic-numeric {
system: extends ethiopic-numeric;
}

2
layout/style/nsCSSKeywordList.h
View File

@ -61,7 +61,6 @@ CSS_KEY(-moz-document, _moz_document)
CSS_KEY(-moz-dragtargetzone, _moz_dragtargetzone)
CSS_KEY(-moz-element, _moz_element)
CSS_KEY(-moz-eventreerow, _moz_eventreerow)
CSS_KEY(-moz-ethiopic-numeric, _moz_ethiopic_numeric)
CSS_KEY(-moz-field, _moz_field)
CSS_KEY(-moz-fieldtext, _moz_fieldtext)
CSS_KEY(-moz-fit-content, _moz_fit_content)
@ -244,6 +243,7 @@ CSS_KEY(em, em)
CSS_KEY(embed, embed)
CSS_KEY(enabled, enabled)
CSS_KEY(end, end)
CSS_KEY(ethiopic-numeric, ethiopic_numeric)
CSS_KEY(ex, ex)
CSS_KEY(exclusion, exclusion)
CSS_KEY(expanded, expanded)

2
layout/style/nsCSSProps.cpp
View File

@ -1387,8 +1387,8 @@ const KTableValue nsCSSProps::kListStyleKTable[] = {
eCSSKeyword_simp_chinese_formal, NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL,
eCSSKeyword_trad_chinese_informal, NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL,
eCSSKeyword_trad_chinese_formal, NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL,
eCSSKeyword_ethiopic_numeric, NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC,
eCSSKeyword__moz_tamil, NS_STYLE_LIST_STYLE_MOZ_TAMIL,
eCSSKeyword__moz_ethiopic_numeric, NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_NUMERIC,
eCSSKeyword_UNKNOWN,-1
};

4
layout/style/nsStyleConsts.h
View File

@ -654,8 +654,8 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_STYLE_LIST_STYLE_SIMP_CHINESE_FORMAL 16
#define NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL 17
#define NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL 18
#define NS_STYLE_LIST_STYLE_MOZ_TAMIL 19
#define NS_STYLE_LIST_STYLE_MOZ_ETHIOPIC_NUMERIC 20
#define NS_STYLE_LIST_STYLE_ETHIOPIC_NUMERIC 19
#define NS_STYLE_LIST_STYLE_MOZ_TAMIL 20
#define NS_STYLE_LIST_STYLE_DISCLOSURE_CLOSED 21
#define NS_STYLE_LIST_STYLE_DISCLOSURE_OPEN 22
#define NS_STYLE_LIST_STYLE__MAX 23

1
layout/style/test/property_database.js
View File

@ -2672,6 +2672,7 @@ var gCSSProperties = {
"korean-hanja-informal", "korean-hanja-formal",
"simp-chinese-informal", "simp-chinese-formal",
"trad-chinese-informal", "trad-chinese-formal",
"ethiopic-numeric",
"-moz-cjk-heavenly-stem", "-moz-cjk-earthly-branch",
"-moz-trad-chinese-informal", "-moz-trad-chinese-formal",
"-moz-simp-chinese-informal", "-moz-simp-chinese-formal",