diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index dabf3bf4cb9..1fb53e6ce06 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -70,15 +70,14 @@ impl DOMTokenListMethods for DOMTokenList { } // https://dom.spec.whatwg.org/#dom-domtokenlist-contains - fn Contains(&self, token: DOMString) -> Fallible { - self.check_token_exceptions(&token).map(|token| { - self.attribute().map_or(false, |attr| { - let attr = attr.r(); - attr.value() - .as_tokens() - .iter() - .any(|atom: &Atom| *atom == token) - }) + fn Contains(&self, token: DOMString) -> bool { + let token = Atom::from(token); + self.attribute().map_or(false, |attr| { + let attr = attr.r(); + attr.value() + .as_tokens() + .iter() + .any(|atom: &Atom| *atom == token) }) } diff --git a/components/script/dom/webidls/DOMTokenList.webidl b/components/script/dom/webidls/DOMTokenList.webidl index 1b50c34c918..2b7da5dea74 100644 --- a/components/script/dom/webidls/DOMTokenList.webidl +++ b/components/script/dom/webidls/DOMTokenList.webidl @@ -9,7 +9,7 @@ interface DOMTokenList { [Pure] getter DOMString? item(unsigned long index); - [Pure, Throws] + [Pure] boolean contains(DOMString token); [Throws] void add(DOMString... tokens); diff --git a/tests/wpt/metadata/dom/nodes/Element-classlist.html.ini b/tests/wpt/metadata/dom/nodes/Element-classlist.html.ini deleted file mode 100644 index 3f1125fd479..00000000000 --- a/tests/wpt/metadata/dom/nodes/Element-classlist.html.ini +++ /dev/null @@ -1,8 +0,0 @@ -[Element-classlist.html] - type: testharness - [.contains(empty_string) must return false] - expected: FAIL - - [.contains(string_with_spaces) must return false] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index cbad8c86cd4..0ec72f756db 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -6286,12 +6286,6 @@ "url": "/_mozilla/mozilla/document_url.html" } ], - "mozilla/domtokenlist.html": [ - { - "path": "mozilla/domtokenlist.html", - "url": "/_mozilla/mozilla/domtokenlist.html" - } - ], "mozilla/element_attribute.html": [ { "path": "mozilla/element_attribute.html", diff --git a/tests/wpt/mozilla/tests/mozilla/domtokenlist.html b/tests/wpt/mozilla/tests/mozilla/domtokenlist.html deleted file mode 100644 index a758d566e3e..00000000000 --- a/tests/wpt/mozilla/tests/mozilla/domtokenlist.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - -