Make DOMTokenList.contains not throw anymore

servo · Jun 4, 2016 · 66b0568 · 66b0568
1 parent 51d41c5
commit 66b0568
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 70 deletions.
diff --git 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<bool> {
-        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
@@ -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
diff --git 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