auto merge of #4621 : jimrhoskins/servo/closest, r=jdm

fixes #4603

- Add definition to the Element.webidl and implementation to element.rs.
- Create inclusive_ancestors helper in NodeHelpers
- Update test expectations

1 files changed, 17 insertions, 0 deletions

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 129756c1575..14f48f5f3b6 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -1120,6 +1120,23 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
             }
         }
     }
+
+    // https://dom.spec.whatwg.org/#dom-element-closest
+    fn Closest(self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> {
+        let parser_context = ParserContext {
+            origin: StylesheetOrigin::Author,
+        };
+        match style::parse_selector_list_from_str(&parser_context, selectors.as_slice()) {
+            Err(()) => Err(Syntax),
+            Ok(ref selectors) => {
+                let root: JSRef<Node> = NodeCast::from_ref(self);
+                Ok(root.inclusive_ancestors()
+                       .filter_map(ElementCast::to_ref)
+                       .find(|element| matches(selectors, &NodeCast::from_ref(*element), &mut None))
+                       .map(Temporary::from_rooted))
+            }
+        }
+    }
 }
 
 pub fn get_attribute_parts<'a>(name: &'a str) -> (Option<&'a str>, &'a str) {