Revert "script: Use atom comparison in more places, especially for attributes." for persistent test failures.

This reverts commit 874db261046d6155b1942efa106d2e0014295d6d.

1 files changed, 10 insertions, 11 deletions

diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs
index 5f1e0d7de37..e57f0310ec5 100644
--- a/components/script/dom/domtokenlist.rs
+++ b/components/script/dom/domtokenlist.rs
@@ -21,23 +21,24 @@ use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
 pub struct DOMTokenList {
     reflector_: Reflector,
     element: JS<Element>,
-    local_name: Atom,
+    local_name: &'static str,
 }
 
 impl DOMTokenList {
-    pub fn new_inherited(element: &JSRef<Element>, local_name: &Atom) -> DOMTokenList {
+    pub fn new_inherited(element: &JSRef<Element>,
+                         local_name: &'static str) -> DOMTokenList {
         DOMTokenList {
             reflector_: Reflector::new(),
             element: JS::from_rooted(element),
-            local_name: local_name.clone(),
+            local_name: local_name,
         }
     }
 
-    pub fn new(element: &JSRef<Element>, local_name: &Atom) -> Temporary<DOMTokenList> {
+    pub fn new(element: &JSRef<Element>,
+               local_name: &'static str) -> Temporary<DOMTokenList> {
         let window = window_from_node(element).root();
         reflect_dom_object(box DOMTokenList::new_inherited(element, local_name),
-                           &Window(*window),
-                           DOMTokenListBinding::Wrap)
+                           &Window(*window), DOMTokenListBinding::Wrap)
     }
 }
 
@@ -55,7 +56,7 @@ trait PrivateDOMTokenListHelpers {
 impl<'a> PrivateDOMTokenListHelpers for JSRef<'a, DOMTokenList> {
     fn attribute(&self) -> Option<Temporary<Attr>> {
         let element = self.element.root();
-        element.deref().get_attribute(Null, &self.local_name)
+        element.deref().get_attribute(Null, self.local_name)
     }
 
     fn check_token_exceptions<'a>(&self, token: &'a str) -> Fallible<&'a str> {
@@ -79,9 +80,7 @@ impl<'a> DOMTokenListMethods for JSRef<'a, DOMTokenList> {
     // http://dom.spec.whatwg.org/#dom-domtokenlist-item
     fn Item(&self, index: u32) -> Option<DOMString> {
         self.attribute().root().and_then(|attr| attr.value().tokens().and_then(|mut tokens| {
-            tokens.iter()
-                  .idx(index as uint)
-                  .map(|token| token.as_slice().to_string())
+            tokens.idx(index as uint).map(|token| token.as_slice().to_string())
         }))
     }
 
@@ -96,7 +95,7 @@ impl<'a> DOMTokenListMethods for JSRef<'a, DOMTokenList> {
         self.check_token_exceptions(token.as_slice()).map(|slice| {
             self.attribute().root().and_then(|attr| attr.value().tokens().map(|mut tokens| {
                 let atom = Atom::from_slice(slice);
-                tokens.iter().any(|token| *token == atom)
+                tokens.any(|token| *token == atom)
             })).unwrap_or(false)
         })
     }