mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Bug 1367315 - stylo: Make :dir argument a case-insensitive identifier
This commit is contained in:
Matt Brubeck
parent
a36edb9970
commit
08a53a3810
2 changed files with 47 additions and 11 deletions
|
|
@ -14,14 +14,15 @@
|
|||
* macro_rules! pseudo_class_macro{
|
||||
* (bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
* string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
* keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
* // do stuff
|
||||
* }
|
||||
* }
|
||||
* apply_non_ts_list!(pseudo_class_macro)
|
||||
* ```
|
||||
*
|
||||
* The string variables will be applied to pseudoclasses that are of the form
|
||||
* of a function with a string argument.
|
||||
* The `string` and `keyword` variables will be applied to pseudoclasses that are of the form of
|
||||
* functions with string or keyword arguments.
|
||||
*
|
||||
* Pending pseudo-classes:
|
||||
*
|
||||
|
|
@ -111,11 +112,13 @@ macro_rules! apply_non_ts_list {
|
|||
],
|
||||
string: [
|
||||
("-moz-system-metric", MozSystemMetric, mozSystemMetric, _, PSEUDO_CLASS_INTERNAL),
|
||||
("-moz-locale-dir", MozLocaleDir, mozLocaleDir, _, PSEUDO_CLASS_INTERNAL),
|
||||
("-moz-empty-except-children-with-localname", MozEmptyExceptChildrenWithLocalname,
|
||||
mozEmptyExceptChildrenWithLocalname, _, PSEUDO_CLASS_INTERNAL),
|
||||
("dir", Dir, dir, _, _),
|
||||
("lang", Lang, lang, _, _),
|
||||
],
|
||||
keyword: [
|
||||
("-moz-locale-dir", MozLocaleDir, mozLocaleDir, _, PSEUDO_CLASS_INTERNAL),
|
||||
("dir", Dir, dir, _, _),
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ bitflags! {
|
|||
|
||||
macro_rules! pseudo_class_name {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
#[doc = "Our representation of a non tree-structural pseudo-class."]
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub enum NonTSPseudoClass {
|
||||
|
|
@ -38,6 +39,10 @@ macro_rules! pseudo_class_name {
|
|||
#[doc = $s_css]
|
||||
$s_name(Box<[u16]>),
|
||||
)*
|
||||
$(
|
||||
#[doc = $k_css]
|
||||
$k_name(Box<[u16]>),
|
||||
)*
|
||||
/// The non-standard `:-moz-any` pseudo-class.
|
||||
///
|
||||
/// TODO(emilio): We disallow combinators and pseudos here, so we
|
||||
|
|
@ -54,7 +59,8 @@ impl ToCss for NonTSPseudoClass {
|
|||
use fmt::Write;
|
||||
macro_rules! pseudo_class_serialize {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
match *self {
|
||||
$(NonTSPseudoClass::$name => concat!(":", $css),)*
|
||||
$(NonTSPseudoClass::$s_name(ref s) => {
|
||||
|
|
@ -69,6 +75,11 @@ impl ToCss for NonTSPseudoClass {
|
|||
}
|
||||
return dest.write_str(")")
|
||||
}, )*
|
||||
$(NonTSPseudoClass::$k_name(ref s) => {
|
||||
// Don't include the terminating nul.
|
||||
let value = String::from_utf16(&s[..s.len() - 1]).unwrap();
|
||||
return write!(dest, ":{}({})", $k_css, value)
|
||||
}, )*
|
||||
NonTSPseudoClass::MozAny(ref selectors) => {
|
||||
dest.write_str(":-moz-any(")?;
|
||||
let mut iter = selectors.iter();
|
||||
|
|
@ -117,10 +128,12 @@ impl NonTSPseudoClass {
|
|||
}
|
||||
macro_rules! pseudo_class_check_internal {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
match *self {
|
||||
$(NonTSPseudoClass::$name => check_flag!($flags),)*
|
||||
$(NonTSPseudoClass::$s_name(..) => check_flag!($s_flags),)*
|
||||
$(NonTSPseudoClass::$k_name(..) => check_flag!($k_flags),)*
|
||||
NonTSPseudoClass::MozAny(_) => false,
|
||||
}
|
||||
}
|
||||
|
|
@ -145,10 +158,12 @@ impl NonTSPseudoClass {
|
|||
}
|
||||
macro_rules! pseudo_class_state {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
match *self {
|
||||
$(NonTSPseudoClass::$name => flag!($state),)*
|
||||
$(NonTSPseudoClass::$s_name(..) => flag!($s_state),)*
|
||||
$(NonTSPseudoClass::$k_name(..) => flag!($k_state),)*
|
||||
NonTSPseudoClass::MozAny(..) => ElementState::empty(),
|
||||
}
|
||||
}
|
||||
|
|
@ -179,10 +194,12 @@ impl NonTSPseudoClass {
|
|||
}
|
||||
macro_rules! pseudo_class_geckotype {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
match *self {
|
||||
$(NonTSPseudoClass::$name => gecko_type!($gecko_type),)*
|
||||
$(NonTSPseudoClass::$s_name(..) => gecko_type!($s_gecko_type),)*
|
||||
$(NonTSPseudoClass::$k_name(..) => gecko_type!($k_gecko_type),)*
|
||||
NonTSPseudoClass::MozAny(_) => gecko_type!(any),
|
||||
}
|
||||
}
|
||||
|
|
@ -215,7 +232,8 @@ impl<'a> ::selectors::Parser for SelectorParser<'a> {
|
|||
fn parse_non_ts_pseudo_class(&self, name: Cow<str>) -> Result<NonTSPseudoClass, ()> {
|
||||
macro_rules! pseudo_class_parse {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
match_ignore_ascii_case! { &name,
|
||||
$($css => NonTSPseudoClass::$name,)*
|
||||
_ => return Err(())
|
||||
|
|
@ -236,7 +254,8 @@ impl<'a> ::selectors::Parser for SelectorParser<'a> {
|
|||
-> Result<NonTSPseudoClass, ()> {
|
||||
macro_rules! pseudo_class_string_parse {
|
||||
(bare: [$(($css:expr, $name:ident, $gecko_type:tt, $state:tt, $flags:tt),)*],
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*]) => {
|
||||
string: [$(($s_css:expr, $s_name:ident, $s_gecko_type:tt, $s_state:tt, $s_flags:tt),)*],
|
||||
keyword: [$(($k_css:expr, $k_name:ident, $k_gecko_type:tt, $k_state:tt, $k_flags:tt),)*]) => {
|
||||
match_ignore_ascii_case! { &name,
|
||||
$($s_css => {
|
||||
let name = parser.expect_ident_or_string()?;
|
||||
|
|
@ -245,6 +264,13 @@ impl<'a> ::selectors::Parser for SelectorParser<'a> {
|
|||
let utf16: Vec<u16> = name.encode_utf16().chain(Some(0u16)).collect();
|
||||
NonTSPseudoClass::$s_name(utf16.into_boxed_slice())
|
||||
}, )*
|
||||
$($k_css => {
|
||||
let name = parser.expect_ident()?;
|
||||
// Convert to ASCII-lowercase nul-terminated UTF-16 string.
|
||||
let utf16: Vec<u16> = name.encode_utf16().map(utf16_to_ascii_lowercase)
|
||||
.chain(Some(0u16)).collect();
|
||||
NonTSPseudoClass::$k_name(utf16.into_boxed_slice())
|
||||
}, )*
|
||||
"-moz-any" => {
|
||||
let selectors = parser.parse_comma_separated(|input| {
|
||||
ComplexSelector::parse(self, input)
|
||||
|
|
@ -315,3 +341,10 @@ impl SelectorImpl {
|
|||
pc.state_flag()
|
||||
}
|
||||
}
|
||||
|
||||
fn utf16_to_ascii_lowercase(unit: u16) -> u16 {
|
||||
match unit {
|
||||
65...90 => unit + 32, // A-Z => a-z
|
||||
_ => unit
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue