Upgrade rust-selectors, pass ':empty' tests

https://github.com/servo/rust-selectors/pull/36

1 files changed, 12 insertions, 2 deletions

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index d7432c570b0..3c0eb8e337e 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -2579,7 +2579,9 @@ impl<'a> VirtualMethods for &'a Node {
     }
 }
 
-impl<'a> ::selectors::Node<&'a Element> for &'a Node {
+impl<'a> ::selectors::Node for &'a Node {
+    type Element = &'a Element;
+
     fn parent_node(&self) -> Option<&'a Node> {
         (*self).parent_node.get()
                .map(|node| node.root().get_unsound_ref_forever())
@@ -2609,9 +2611,17 @@ impl<'a> ::selectors::Node<&'a Element> for &'a Node {
         DocumentDerived::is_document(*self)
     }
 
-    fn as_element(&self) -> Option<&'a Element> {
+    fn as_element(&self) -> Option<Self::Element> {
         ElementCast::to_ref(*self)
     }
+
+    fn is_element_or_non_empty_text(&self) -> bool {
+        if self.is_text() {
+            self.GetTextContent().map_or(false, |s| !s.is_empty())
+        } else {
+            self.is_element()
+        }
+    }
 }
 
 pub trait DisabledStateHelpers {