Support lang pseudo class

components/script/dom/element.rs

@@ -354,6 +354,7 @@ pub trait LayoutElementHelpers {
     fn style_attribute(&self) -> *const Option<Arc<RwLock<PropertyDeclarationBlock>>>;
     fn local_name(&self) -> &LocalName;
     fn namespace(&self) -> &Namespace;
+    fn get_lang_for_layout(&self) -> String;
     fn get_checked_state_for_layout(&self) -> bool;
     fn get_indeterminate_state_for_layout(&self) -> bool;
     fn get_state_for_layout(&self) -> ElementState;
@@ -693,6 +694,30 @@ impl LayoutElementHelpers for LayoutJS<Element> {
         }
     }
 
+    #[allow(unsafe_code)]
+    fn get_lang_for_layout(&self) -> String {
+        unsafe {
+            let mut current_node = Some(self.upcast::<Node>());
+            while let Some(node) = current_node {
+                current_node = node.parent_node_ref();
+                match node.downcast::<Element>().map(|el| el.unsafe_get()) {
+                    Some(elem) => {
+                        if let Some(attr) = (*elem).get_attr_val_for_layout(&ns!(xml), &local_name!("lang")) {
+                            return attr.to_owned();
+                        }
+                        if let Some(attr) = (*elem).get_attr_val_for_layout(&ns!(), &local_name!("lang")) {
+                            return attr.to_owned();
+                        }
+                    }
+                    None => continue
+                }
+            }
+            // TODO: Check meta tags for a pragma-set default language
+            // TODO: Check HTTP Content-Language header
+            String::new()
+        }
+    }
+
     #[inline]
     #[allow(unsafe_code)]
     fn get_checked_state_for_layout(&self) -> bool {
@@ -2372,6 +2397,10 @@ impl<'a> ::selectors::Element for Root<Element> {
                 }
             },
 
+            // FIXME(#15746): This is wrong, we need to instead use extended filtering as per RFC4647
+            //                https://tools.ietf.org/html/rfc4647#section-3.3.2
+            NonTSPseudoClass::Lang(ref lang) => lang.eq_ignore_ascii_case(&self.get_lang()),
+
             NonTSPseudoClass::ReadOnly =>
                 !Element::state(self).contains(pseudo_class.state_flag()),
 
@@ -2576,6 +2605,19 @@ impl Element {
         self.set_click_in_progress(false);
     }
 
+    // https://html.spec.whatwg.org/multipage/#language
+    pub fn get_lang(&self) -> String {
+        self.upcast::<Node>().inclusive_ancestors().filter_map(|node| {
+            node.downcast::<Element>().and_then(|el| {
+                el.get_attribute(&ns!(xml), &local_name!("lang")).or_else(|| {
+                    el.get_attribute(&ns!(), &local_name!("lang"))
+                }).map(|attr| String::from(attr.Value()))
+            })
+        // TODO: Check meta tags for a pragma-set default language
+        // TODO: Check HTTP Content-Language header
+        }).next().unwrap_or(String::new())
+    }
+
     pub fn state(&self) -> ElementState {
         self.state.get()
     }

components/script/layout_wrapper.rs

@@ -53,6 +53,7 @@ use selectors::matching::ElementSelectorFlags;
 use selectors::parser::{AttrSelector, NamespaceConstraint};
 use servo_atoms::Atom;
 use servo_url::ServoUrl;
+use std::ascii::AsciiExt;
 use std::fmt;
 use std::fmt::Debug;
 use std::marker::PhantomData;
@@ -618,6 +619,10 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
             },
             NonTSPseudoClass::Visited => false,
 
+            // FIXME(#15746): This is wrong, we need to instead use extended filtering as per RFC4647
+            //                https://tools.ietf.org/html/rfc4647#section-3.3.2
+            NonTSPseudoClass::Lang(ref lang) => lang.eq_ignore_ascii_case(&self.element.get_lang_for_layout()),
+
             NonTSPseudoClass::ServoNonZeroBorder => unsafe {
                 match (*self.element.unsafe_get()).get_attr_for_layout(&ns!(), &local_name!("border")) {
                     None | Some(&AttrValue::UInt(_, 0)) => false,

components/style/servo/selector_parser.rs

@@ -8,7 +8,7 @@
 
 use {Atom, Prefix, Namespace, LocalName};
 use attr::{AttrIdentifier, AttrValue};
-use cssparser::ToCss;
+use cssparser::{Parser as CssParser, ToCss, serialize_identifier};
 use element_state::ElementState;
 use restyle_hints::ElementSnapshot;
 use selector_parser::{ElementExt, PseudoElementCascadeType, SelectorParser};
@@ -100,44 +100,52 @@ impl PseudoElement {
 #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
 #[allow(missing_docs)]
 pub enum NonTSPseudoClass {
-    AnyLink,
-    Link,
-    Visited,
     Active,
+    AnyLink,
+    Checked,
+    Disabled,
+    Enabled,
     Focus,
     Fullscreen,
     Hover,
-    Enabled,
-    Disabled,
-    Checked,
     Indeterminate,
-    ServoNonZeroBorder,
+    Lang(Box<str>),
+    Link,
+    PlaceholderShown,
     ReadWrite,
     ReadOnly,
-    PlaceholderShown,
+    ServoNonZeroBorder,
     Target,
+    Visited,
 }
 
 impl ToCss for NonTSPseudoClass {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
         use self::NonTSPseudoClass::*;
+        if let Lang(ref lang) = *self {
+            dest.write_str(":lang(")?;
+            serialize_identifier(lang, dest)?;
+            return dest.write_str(")");
+        }
+
         dest.write_str(match *self {
-            AnyLink => ":any-link",
-            Link => ":link",
-            Visited => ":visited",
             Active => ":active",
+            AnyLink => ":any-link",
+            Checked => ":checked",
+            Disabled => ":disabled",
+            Enabled => ":enabled",
             Focus => ":focus",
             Fullscreen => ":fullscreen",
             Hover => ":hover",
-            Enabled => ":enabled",
-            Disabled => ":disabled",
-            Checked => ":checked",
             Indeterminate => ":indeterminate",
+            Lang(_) => unreachable!(),
+            Link => ":link",
+            PlaceholderShown => ":placeholder-shown",
             ReadWrite => ":read-write",
             ReadOnly => ":read-only",
-            PlaceholderShown => ":placeholder-shown",
-            Target => ":target",
             ServoNonZeroBorder => ":-servo-nonzero-border",
+            Target => ":target",
+            Visited => ":visited",
         })
     }
 }
@@ -162,6 +170,7 @@ impl NonTSPseudoClass {
             Target => IN_TARGET_STATE,
 
             AnyLink |
+            Lang(_) |
             Link |
             Visited |
             ServoNonZeroBorder => ElementState::empty(),
@@ -204,21 +213,21 @@ impl<'a> ::selectors::Parser for SelectorParser<'a> {
     fn parse_non_ts_pseudo_class(&self, name: Cow<str>) -> Result<NonTSPseudoClass, ()> {
         use self::NonTSPseudoClass::*;
         let pseudo_class = match_ignore_ascii_case! { &name,
-            "any-link" => AnyLink,
-            "link" => Link,
-            "visited" => Visited,
             "active" => Active,
+            "any-link" => AnyLink,
+            "checked" => Checked,
+            "disabled" => Disabled,
+            "enabled" => Enabled,
             "focus" => Focus,
             "fullscreen" => Fullscreen,
             "hover" => Hover,
-            "enabled" => Enabled,
-            "disabled" => Disabled,
-            "checked" => Checked,
             "indeterminate" => Indeterminate,
+            "link" => Link,
+            "placeholder-shown" => PlaceholderShown,
             "read-write" => ReadWrite,
             "read-only" => ReadOnly,
-            "placeholder-shown" => PlaceholderShown,
             "target" => Target,
+            "visited" => Visited,
             "-servo-nonzero-border" => {
                 if !self.in_user_agent_stylesheet() {
                     return Err(());
@@ -231,6 +240,19 @@ impl<'a> ::selectors::Parser for SelectorParser<'a> {
         Ok(pseudo_class)
     }
 
+    fn parse_non_ts_functional_pseudo_class(&self,
+                                            name: Cow<str>,
+                                            parser: &mut CssParser)
+                                            -> Result<NonTSPseudoClass, ()> {
+        use self::NonTSPseudoClass::*;
+        let pseudo_class = match_ignore_ascii_case!{ &name,
+            "lang" => Lang(String::from(try!(parser.expect_ident_or_string())).into_boxed_str()),
+            _ => return Err(())
+        };
+
+        Ok(pseudo_class)
+    }
+
     fn parse_pseudo_element(&self, name: Cow<str>) -> Result<PseudoElement, ()> {
         use self::PseudoElement::*;
         let pseudo_element = match_ignore_ascii_case! { &name,

tests/wpt/include_css.ini

@@ -149,3 +149,6 @@ skip: true
     skip: true
   [xhtml1print]
     skip: true
+
+[selectors-3_dev]
+  skip: false

tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-005.htm.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-005.htm]
+  type: testharness
+  [A :lang value will match a lang attribute value when the latter contains additional subtags.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-009.htm.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-009.htm]
+  type: testharness
+  [A :lang value with a multiple subtags will match a lang attribute value with multiple subtags as long as the first part is the same.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-024.htm.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-024.htm]
+  type: testharness
+  [A lang|= value will match a lang attribute value regardless of case differences.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-035.htm.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-035.htm]
+  type: testharness
+  [A lang|= value will match a lang attribute value regardless of case differences in the script tag.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-044.htm.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-044.htm]
+  type: testharness
+  [A lang= value will match a lang attribute value regardless of case differences.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/html/css3-selectors-lang-055.htm.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-055.htm]
+  type: testharness
+  [A lang= value will match a lang attribute value regardless of case differences in the script tag.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/html/grid-first-letter-001.htm.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-001.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-first-letter-002.htm.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-002.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-first-letter-003.htm.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-003.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/css21_dev/html4/case-sensitive-004.htm.ini → tests/wpt/metadata-css/selectors-3_dev/html/grid-first-line-001.htm.ini

@@ -1,3 +1,3 @@
-[case-sensitive-004.htm]
+[grid-first-line-001.htm]
   type: reftest
   expected: FAIL

tests/wpt/metadata-css/css21_dev/html4/lang-selector-003.htm.ini → tests/wpt/metadata-css/selectors-3_dev/html/grid-first-line-002.htm.ini

@@ -1,3 +1,3 @@
-[lang-selector-003.htm]
+[grid-first-line-002.htm]
   type: reftest
   expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-first-line-003.htm.ini

@@ -0,0 +1,3 @@
+[grid-first-line-003.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-inline-first-letter-001.htm.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-letter-001.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-inline-first-letter-002.htm.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-letter-002.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-inline-first-letter-003.htm.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-letter-003.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-inline-first-line-001.htm.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-line-001.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-inline-first-line-002.htm.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-line-002.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/html/grid-inline-first-line-003.htm.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-line-003.htm]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-005.xht.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-005.xht]
+  type: testharness
+  [A :lang value will match a lang attribute value when the latter contains additional subtags.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/xhtml1/css3-selectors-lang-009.xht.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-009.xht]
+  type: testharness
+  [A :lang value with a multiple subtags will match a lang attribute value with multiple subtags as long as the first part is the same.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-first-letter-001.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-001.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-first-letter-002.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-002.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-first-letter-003.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-003.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-first-line-001.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-line-001.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-first-line-002.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-line-002.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-first-line-003.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-line-003.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-inline-first-letter-001.xht.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-letter-001.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-inline-first-letter-002.xht.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-letter-002.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-inline-first-letter-003.xht.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-letter-003.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-inline-first-line-001.xht.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-line-001.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-inline-first-line-002.xht.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-line-002.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1/grid-inline-first-line-003.xht.ini

@@ -0,0 +1,3 @@
+[grid-inline-first-line-003.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-005.xht.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-005.xht]
+  type: testharness
+  [A :lang value will match a lang attribute value when the latter contains additional subtags.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/xhtml1print/css3-selectors-lang-009.xht.ini

@@ -0,0 +1,5 @@
+[css3-selectors-lang-009.xht]
+  type: testharness
+  [A :lang value with a multiple subtags will match a lang attribute value with multiple subtags as long as the first part is the same.]
+    expected: FAIL
+

tests/wpt/metadata-css/selectors-3_dev/xhtml1print/grid-first-letter-001.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-001.xht]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata-css/selectors-3_dev/xhtml1print/grid-first-letter-002.xht.ini

@@ -0,0 +1,3 @@
+[grid-first-letter-002.xht]
+  type: reftest
+  expected: FAIL