зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1848491) for causing reftest failures in unicode-lang.html CLOSED TREE
Backed out changeset cc1e56d6f6ab (bug 1848491) Backed out changeset c2e6e49bdeef (bug 1848491)
This commit is contained in:
Cristian Tuns
Родитель
f7e58ca768
Коммит
f8a47abf20
|
|
@ -82,78 +82,32 @@ bool nsStyleUtil::LangTagCompare(const nsACString& aAttributeValue,
|
|||
return false;
|
||||
}
|
||||
|
||||
int32_t attrPriv = -1;
|
||||
AutoLangId attrLangId(aAttributeValue);
|
||||
if (!attrLangId.IsValid()) {
|
||||
// If it was invalid due to private subtags, try stripping them and
|
||||
// re-parsing what remains.
|
||||
attrPriv = aAttributeValue.LowerCaseFindASCII("-x-");
|
||||
if (attrPriv >= 0) {
|
||||
nsAutoCString temp(aAttributeValue);
|
||||
temp.Truncate(attrPriv);
|
||||
attrLangId.Reset(temp);
|
||||
if (!attrLangId.IsValid()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
int32_t selPriv = -1;
|
||||
AutoLangId selectorId(aSelectorValue);
|
||||
if (!selectorId.IsValid()) {
|
||||
// If it was "invalid" because of a wildcard language subtag, replace that
|
||||
// with 'und' and try again.
|
||||
// XXX Should unic_langid_new handle the wildcard internally?
|
||||
bool wildcard = false;
|
||||
if (aSelectorValue[0] == '*') {
|
||||
wildcard = true;
|
||||
nsAutoCString temp(aSelectorValue);
|
||||
temp.Replace(0, 1, "und");
|
||||
selectorId.Reset(temp);
|
||||
if (selectorId.IsValid()) {
|
||||
intl::ffi::unic_langid_clear_language(selectorId);
|
||||
if (!selectorId.IsValid()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// If it was invalid due to private subtags, try stripping them.
|
||||
if (!selectorId.IsValid()) {
|
||||
selPriv = aSelectorValue.LowerCaseFindASCII("-x-");
|
||||
if (selPriv >= 0) {
|
||||
nsAutoCString temp(aSelectorValue);
|
||||
temp.Truncate(selPriv);
|
||||
// Also do the wildcard replacement if necessary.
|
||||
if (wildcard) {
|
||||
temp.Replace(0, 1, "und");
|
||||
}
|
||||
selectorId.Reset(temp);
|
||||
if (!selectorId.IsValid()) {
|
||||
return false;
|
||||
}
|
||||
if (wildcard) {
|
||||
intl::ffi::unic_langid_clear_language(selectorId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!intl::ffi::unic_langid_matches(attrLangId, selectorId,
|
||||
/* match addrLangId as range */ false,
|
||||
/* match selectorId as range */ true)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If the selector included private subtags, we also require them to match.
|
||||
// However, if the attribute has private subtags but the selector doesn't,
|
||||
// they are ignored; the selector still matches the (non-private) subtags in
|
||||
// the attribute.
|
||||
if (selPriv >= 0) {
|
||||
if (attrPriv < 0) {
|
||||
intl::ffi::unic_langid_clear_language(selectorId);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return Substring(aAttributeValue, attrPriv)
|
||||
.EqualsIgnoreCase(Substring(aSelectorValue, selPriv));
|
||||
}
|
||||
|
||||
return true;
|
||||
return intl::ffi::unic_langid_matches(attrLangId, selectorId,
|
||||
/* match addrLangId as range */ false,
|
||||
/* match selectorId as range */ true);
|
||||
}
|
||||
|
||||
bool nsStyleUtil::ValueIncludes(const nsAString& aValueList,
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en-US">
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Selectors 4 - :lang matching</title>
|
||||
<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
|
||||
<link rel="match" href="lang-000-ref.html">
|
||||
|
||||
<style>
|
||||
div.test { color: red; }
|
||||
:lang(fr) { color: green; }
|
||||
</style>
|
||||
|
||||
<div class="test"><span lang="fr-FR-x-foobar">This should be green</span></div>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en-US">
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Selectors 4 - :lang matching</title>
|
||||
<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
|
||||
<link rel="match" href="lang-000-ref.html">
|
||||
|
||||
<style>
|
||||
div.test { color: red; }
|
||||
:lang("fr-x-foobar") { color: green; }
|
||||
</style>
|
||||
|
||||
<div class="test"><span lang="fr-Latn-FR-x-foobar">This should be green</span></div>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en-US">
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Selectors 4 - :lang matching</title>
|
||||
<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
|
||||
<link rel="match" href="lang-000-ref.html">
|
||||
|
||||
<style>
|
||||
div.test { color: red; }
|
||||
:lang("*-x-foobar") { color: green; }
|
||||
</style>
|
||||
|
||||
<div class="test"><span lang="fr-Latn-FR-x-foobar">This should be green</span></div>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en-US">
|
||||
<meta charset="utf-8">
|
||||
<title>CSS Selectors 4 - :lang matching</title>
|
||||
<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
|
||||
<link rel="help" href="https://drafts.csswg.org/selectors-4/#the-lang-pseudo">
|
||||
<link rel="match" href="lang-000-ref.html">
|
||||
|
||||
<style>
|
||||
div.test { color: green; }
|
||||
:lang("fr-x-foobar") { color: red; }
|
||||
</style>
|
||||
|
||||
<div class="test"><span lang="fr">This should be green</span></div>
|
||||
Загрузка…
Ссылка в новой задаче