servo: Merge #8786 - Remove unnecessary conversion to/from DOMString for localName (from eefriedman:localname-atom); r=jdm

Source-Repo: https://github.com/servo/servo Source-Revision: 63762d2b52ee6026216d304c8826bf8b4a5fdd20
2015-12-03 14:36:22 +05:01 · 2015-12-03 14:36:22 +05:01 · 70ebd13eff
--- a/servo/components/script/dom/create.rs
+++ b/servo/components/script/dom/create.rs
@ -87,16 +87,16 @@ pub fn create_element(name: QualName,
    let prefix = prefix.map(|p| DOMString::from(&*p));

    if name.ns != ns!(html) {
-        return Element::new(DOMString::from(&*name.local), name.ns, prefix, document);
+        return Element::new(name.local, name.ns, prefix, document);
    }

    macro_rules! make(
        ($ctor:ident) => ({
-            let obj = $ctor::new(DOMString::from(&*name.local), prefix, document);
+            let obj = $ctor::new(name.local, prefix, document);
            Root::upcast(obj)
        });
        ($ctor:ident, $($arg:expr),+) => ({
-            let obj = $ctor::new(DOMString::from(&*name.local), prefix, document, $($arg),+);
+            let obj = $ctor::new(name.local, prefix, document, $($arg),+);
            Root::upcast(obj)
        })
    );
--- a/servo/components/script/dom/domimplementation.rs
+++ b/servo/components/script/dom/domimplementation.rs
@ -132,14 +132,14 @@ impl DOMImplementationMethods for DOMImplementation {
        {
            // Step 4.
            let doc_node = doc.upcast::<Node>();
-            let doc_html = Root::upcast::<Node>(HTMLHtmlElement::new(DOMString::from("html"),
+            let doc_html = Root::upcast::<Node>(HTMLHtmlElement::new(atom!("html"),
                                                                     None,
                                                                     doc.r()));
            doc_node.AppendChild(&doc_html).expect("Appending failed");

            {
                // Step 5.
-                let doc_head = Root::upcast::<Node>(HTMLHeadElement::new(DOMString::from("head"),
+                let doc_head = Root::upcast::<Node>(HTMLHeadElement::new(atom!("head"),
                                                                         None,
                                                                         doc.r()));
                doc_html.AppendChild(&doc_head).unwrap();
@ -150,7 +150,7 @@ impl DOMImplementationMethods for DOMImplementation {
                    Some(title_str) => {
                        // Step 6.1.
                        let doc_title =
-                            Root::upcast::<Node>(HTMLTitleElement::new(DOMString::from("title"),
+                            Root::upcast::<Node>(HTMLTitleElement::new(atom!("title"),
                                                                       None,
                                                                       doc.r()));
                        doc_head.AppendChild(&doc_title).unwrap();
@ -163,7 +163,7 @@ impl DOMImplementationMethods for DOMImplementation {
            }

            // Step 7.
-            let doc_body = HTMLBodyElement::new(DOMString::from("body"), None, doc.r());
+            let doc_body = HTMLBodyElement::new(atom!("body"), None, doc.r());
            doc_html.AppendChild(doc_body.upcast()).unwrap();
        }

--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@ -126,20 +126,20 @@ impl Element {
    }


-    pub fn new_inherited(local_name: DOMString,
+    pub fn new_inherited(local_name: Atom,
                         namespace: Namespace, prefix: Option<DOMString>,
                         document: &Document) -> Element {
        Element::new_inherited_with_state(ElementState::empty(), local_name,
                                          namespace, prefix, document)
    }

-    pub fn new_inherited_with_state(state: ElementState, local_name: DOMString,
+    pub fn new_inherited_with_state(state: ElementState, local_name: Atom,
                                    namespace: Namespace, prefix: Option<DOMString>,
                                    document: &Document)
                                    -> Element {
        Element {
            node: Node::new_inherited(document),
-            local_name: Atom::from(&*local_name),
+            local_name: local_name,
            namespace: namespace,
            prefix: prefix,
            attrs: DOMRefCell::new(vec![]),
@ -151,7 +151,7 @@ impl Element {
        }
    }

-    pub fn new(local_name: DOMString,
+    pub fn new(local_name: Atom,
               namespace: Namespace,
               prefix: Option<DOMString>,
               document: &Document) -> Root<Element> {
--- a/servo/components/script/dom/htmlanchorelement.rs
+++ b/servo/components/script/dom/htmlanchorelement.rs
@ -35,7 +35,7 @@ pub struct HTMLAnchorElement {
 }

 impl HTMLAnchorElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLAnchorElement {
        HTMLAnchorElement {
@ -46,7 +46,7 @@ impl HTMLAnchorElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLAnchorElement> {
        let element = HTMLAnchorElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlappletelement.rs
+++ b/servo/components/script/dom/htmlappletelement.rs
@ -20,7 +20,7 @@ pub struct HTMLAppletElement {
 }

 impl HTMLAppletElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLAppletElement {
        HTMLAppletElement {
@ -30,7 +30,7 @@ impl HTMLAppletElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLAppletElement> {
        let element = HTMLAppletElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlareaelement.rs
+++ b/servo/components/script/dom/htmlareaelement.rs
@ -24,7 +24,7 @@ pub struct HTMLAreaElement {
 }

 impl HTMLAreaElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLAreaElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLAreaElement {
        HTMLAreaElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
            rel_list: Default::default(),
@ -32,7 +32,7 @@ impl HTMLAreaElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLAreaElement> {
        let element = HTMLAreaElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlaudioelement.rs
+++ b/servo/components/script/dom/htmlaudioelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlmediaelement::HTMLMediaElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLAudioElement {
 }

 impl HTMLAudioElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLAudioElement {
        HTMLAudioElement {
@ -25,7 +26,7 @@ impl HTMLAudioElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLAudioElement> {
        let element = HTMLAudioElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlbaseelement.rs
+++ b/servo/components/script/dom/htmlbaseelement.rs
@ -11,6 +11,7 @@ use dom::element::{AttributeMutation, Element};
 use dom::htmlelement::HTMLElement;
 use dom::node::{Node, document_from_node};
 use dom::virtualmethods::VirtualMethods;
+use string_cache::Atom;
 use url::{Url, UrlParser};
 use util::str::DOMString;

@ -20,14 +21,14 @@ pub struct HTMLBaseElement {
 }

 impl HTMLBaseElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLBaseElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLBaseElement {
        HTMLBaseElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLBaseElement> {
        let element = HTMLBaseElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlbodyelement.rs
+++ b/servo/components/script/dom/htmlbodyelement.rs
@ -36,7 +36,7 @@ pub struct HTMLBodyElement {
 }

 impl HTMLBodyElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document)
                     -> HTMLBodyElement {
        HTMLBodyElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
@ -45,7 +45,7 @@ impl HTMLBodyElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document)
               -> Root<HTMLBodyElement> {
        let element = HTMLBodyElement::new_inherited(localName, prefix, document);
        Node::reflect_node(box element, document, HTMLBodyElementBinding::Wrap)
--- a/servo/components/script/dom/htmlbrelement.rs
+++ b/servo/components/script/dom/htmlbrelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLBRElement {
 }

 impl HTMLBRElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLBRElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLBRElement {
        HTMLBRElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLBRElement> {
        let element = HTMLBRElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlbuttonelement.rs
+++ b/servo/components/script/dom/htmlbuttonelement.rs
@ -23,6 +23,7 @@ use dom::virtualmethods::VirtualMethods;
 use selectors::states::*;
 use std::ascii::AsciiExt;
 use std::cell::Cell;
+use string_cache::Atom;
 use util::str::DOMString;

 #[derive(JSTraceable, PartialEq, Copy, Clone)]
@ -42,7 +43,7 @@ pub struct HTMLButtonElement {
 }

 impl HTMLButtonElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLButtonElement {
        HTMLButtonElement {
@ -55,7 +56,7 @@ impl HTMLButtonElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLButtonElement> {
        let element = HTMLButtonElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlcanvaselement.rs
+++ b/servo/components/script/dom/htmlcanvaselement.rs
@ -60,7 +60,7 @@ impl PartialEq for HTMLCanvasElement {
 }

 impl HTMLCanvasElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLCanvasElement {
        HTMLCanvasElement {
@ -70,7 +70,7 @@ impl HTMLCanvasElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLCanvasElement> {
        let element = HTMLCanvasElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmldataelement.rs
+++ b/servo/components/script/dom/htmldataelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLDataElement {
 }

 impl HTMLDataElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLDataElement {
        HTMLDataElement {
@ -24,7 +25,7 @@ impl HTMLDataElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLDataElement> {
        let element = HTMLDataElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmldatalistelement.rs
+++ b/servo/components/script/dom/htmldatalistelement.rs
@ -12,6 +12,7 @@ use dom::htmlcollection::{CollectionFilter, HTMLCollection};
 use dom::htmlelement::HTMLElement;
 use dom::htmloptionelement::HTMLOptionElement;
 use dom::node::{Node, window_from_node};
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -20,7 +21,7 @@ pub struct HTMLDataListElement {
 }

 impl HTMLDataListElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLDataListElement {
        HTMLDataListElement {
@ -30,7 +31,7 @@ impl HTMLDataListElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLDataListElement> {
        let element = HTMLDataListElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmldialogelement.rs
+++ b/servo/components/script/dom/htmldialogelement.rs
@ -9,6 +9,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -18,7 +19,7 @@ pub struct HTMLDialogElement {
 }

 impl HTMLDialogElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLDialogElement {
        HTMLDialogElement {
@ -29,7 +30,7 @@ impl HTMLDialogElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLDialogElement> {
        let element = HTMLDialogElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmldirectoryelement.rs
+++ b/servo/components/script/dom/htmldirectoryelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLDirectoryElement {
 }

 impl HTMLDirectoryElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLDirectoryElement {
        HTMLDirectoryElement {
@ -25,7 +26,7 @@ impl HTMLDirectoryElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLDirectoryElement> {
        let element = HTMLDirectoryElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmldivelement.rs
+++ b/servo/components/script/dom/htmldivelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLDivElement {
 }

 impl HTMLDivElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLDivElement {
        HTMLDivElement {
@ -24,7 +25,7 @@ impl HTMLDivElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLDivElement> {
        let element = HTMLDivElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmldlistelement.rs
+++ b/servo/components/script/dom/htmldlistelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLDListElement {
 }

 impl HTMLDListElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLDListElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLDListElement {
        HTMLDListElement {
            htmlelement:
                HTMLElement::new_inherited(localName, prefix, document)
@ -23,7 +24,7 @@ impl HTMLDListElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLDListElement> {
        let element = HTMLDListElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlelement.rs
+++ b/servo/components/script/dom/htmlelement.rs
@ -54,12 +54,12 @@ impl PartialEq for HTMLElement {
 }

 impl HTMLElement {
-    pub fn new_inherited(tag_name: DOMString, prefix: Option<DOMString>,
+    pub fn new_inherited(tag_name: Atom, prefix: Option<DOMString>,
                         document: &Document) -> HTMLElement {
        HTMLElement::new_inherited_with_state(ElementState::empty(), tag_name, prefix, document)
    }

-    pub fn new_inherited_with_state(state: ElementState, tag_name: DOMString,
+    pub fn new_inherited_with_state(state: ElementState, tag_name: Atom,
                                    prefix: Option<DOMString>, document: &Document)
                                    -> HTMLElement {
        HTMLElement {
@ -71,7 +71,7 @@ impl HTMLElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> Root<HTMLElement> {
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document) -> Root<HTMLElement> {
        let element = HTMLElement::new_inherited(localName, prefix, document);
        Node::reflect_node(box element, document, HTMLElementBinding::Wrap)
    }
--- a/servo/components/script/dom/htmlembedelement.rs
+++ b/servo/components/script/dom/htmlembedelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLEmbedElement {
 }

 impl HTMLEmbedElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLEmbedElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLEmbedElement {
        HTMLEmbedElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLEmbedElement> {
        let element = HTMLEmbedElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlfieldsetelement.rs
+++ b/servo/components/script/dom/htmlfieldsetelement.rs
@ -17,6 +17,7 @@ use dom::node::{Node, window_from_node};
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 use selectors::states::*;
+use string_cache::Atom;
 use util::str::{DOMString, StaticStringVec};

 #[dom_struct]
@ -25,7 +26,7 @@ pub struct HTMLFieldSetElement {
 }

 impl HTMLFieldSetElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLFieldSetElement {
        HTMLFieldSetElement {
@ -36,7 +37,7 @@ impl HTMLFieldSetElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLFieldSetElement> {
        let element = HTMLFieldSetElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlfontelement.rs
+++ b/servo/components/script/dom/htmlfontelement.rs
@ -24,14 +24,14 @@ pub struct HTMLFontElement {


 impl HTMLFontElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLFontElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLFontElement {
        HTMLFontElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLFontElement> {
        let element = HTMLFontElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlformelement.rs
+++ b/servo/components/script/dom/htmlformelement.rs
@ -49,7 +49,7 @@ impl PartialEq for HTMLFormElement {
 }

 impl HTMLFormElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLFormElement {
        HTMLFormElement {
@ -59,7 +59,7 @@ impl HTMLFormElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLFormElement> {
        let element = HTMLFormElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlframeelement.rs
+++ b/servo/components/script/dom/htmlframeelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLFrameElement {
 }

 impl HTMLFrameElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLFrameElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLFrameElement {
        HTMLFrameElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLFrameElement> {
        let element = HTMLFrameElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlframesetelement.rs
+++ b/servo/components/script/dom/htmlframesetelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLFrameSetElement {
 }

 impl HTMLFrameSetElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLFrameSetElement {
        HTMLFrameSetElement {
@ -25,7 +26,7 @@ impl HTMLFrameSetElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLFrameSetElement> {
        let element = HTMLFrameSetElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlheadelement.rs
+++ b/servo/components/script/dom/htmlheadelement.rs
@ -10,6 +10,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::Node;
 use dom::userscripts::load_script;
 use dom::virtualmethods::VirtualMethods;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -18,7 +19,7 @@ pub struct HTMLHeadElement {
 }

 impl HTMLHeadElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLHeadElement {
        HTMLHeadElement {
@ -27,7 +28,7 @@ impl HTMLHeadElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLHeadElement> {
        let element = HTMLHeadElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlheadingelement.rs
+++ b/servo/components/script/dom/htmlheadingelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[derive(JSTraceable, HeapSizeOf)]
@ -26,7 +27,7 @@ pub struct HTMLHeadingElement {
 }

 impl HTMLHeadingElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document,
                     level: HeadingLevel) -> HTMLHeadingElement {
@ -38,7 +39,7 @@ impl HTMLHeadingElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document,
               level: HeadingLevel) -> Root<HTMLHeadingElement> {
--- a/servo/components/script/dom/htmlhrelement.rs
+++ b/servo/components/script/dom/htmlhrelement.rs
@ -21,14 +21,14 @@ pub struct HTMLHRElement {
 }

 impl HTMLHRElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLHRElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLHRElement {
        HTMLHRElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLHRElement> {
        let element = HTMLHRElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlhtmlelement.rs
+++ b/servo/components/script/dom/htmlhtmlelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLHtmlElement {
 }

 impl HTMLHtmlElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLHtmlElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLHtmlElement {
        HTMLHtmlElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLHtmlElement> {
        let element = HTMLHtmlElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmliframeelement.rs
+++ b/servo/components/script/dom/htmliframeelement.rs
@ -160,7 +160,7 @@ impl HTMLIFrameElement {
        self.subpage_id.set(Some(new_subpage_id));
    }

-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLIFrameElement {
        HTMLIFrameElement {
@ -173,7 +173,7 @@ impl HTMLIFrameElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLIFrameElement> {
        let element = HTMLIFrameElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlimageelement.rs
+++ b/servo/components/script/dom/htmlimageelement.rs
@ -128,7 +128,7 @@ impl HTMLImageElement {
        }
    }

-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLImageElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLImageElement {
        HTMLImageElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
            url: DOMRefCell::new(None),
@ -137,7 +137,7 @@ impl HTMLImageElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLImageElement> {
        let element = HTMLImageElement::new_inherited(localName, prefix, document);
@ -148,7 +148,7 @@ impl HTMLImageElement {
                 width: Option<u32>,
                 height: Option<u32>) -> Fallible<Root<HTMLImageElement>> {
        let document = global.as_window().Document();
-        let image = HTMLImageElement::new(DOMString::from("img"), None, document.r());
+        let image = HTMLImageElement::new(atom!("img"), None, document.r());
        if let Some(w) = width {
            image.SetWidth(w);
        }
--- a/servo/components/script/dom/htmlinputelement.rs
+++ b/servo/components/script/dom/htmlinputelement.rs
@ -107,7 +107,7 @@ static DEFAULT_INPUT_SIZE: u32 = 20;
 static DEFAULT_MAX_LENGTH: i32 = -1;

 impl HTMLInputElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLInputElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLInputElement {
        let chan = document.window().constellation_chan();
        HTMLInputElement {
            htmlelement:
@ -125,7 +125,7 @@ impl HTMLInputElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLInputElement> {
        let element = HTMLInputElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmllabelelement.rs
+++ b/servo/components/script/dom/htmllabelelement.rs
@ -25,7 +25,7 @@ pub struct HTMLLabelElement {
 }

 impl HTMLLabelElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLLabelElement {
        HTMLLabelElement {
@ -35,7 +35,7 @@ impl HTMLLabelElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLLabelElement> {
        let element = HTMLLabelElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmllegendelement.rs
+++ b/servo/components/script/dom/htmllegendelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLLegendElement {
 }

 impl HTMLLegendElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLLegendElement {
        HTMLLegendElement {
@ -25,7 +26,7 @@ impl HTMLLegendElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLLegendElement> {
        let element = HTMLLegendElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmllielement.rs
+++ b/servo/components/script/dom/htmllielement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLLIElement {
 }

 impl HTMLLIElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLLIElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLLIElement {
        HTMLLIElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLLIElement> {
        let element = HTMLLIElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmllinkelement.rs
+++ b/servo/components/script/dom/htmllinkelement.rs
@ -53,7 +53,7 @@ pub struct HTMLLinkElement {
 }

 impl HTMLLinkElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document,
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document,
                     creator: ElementCreator) -> HTMLLinkElement {
        HTMLLinkElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
@ -64,7 +64,7 @@ impl HTMLLinkElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document,
               creator: ElementCreator) -> Root<HTMLLinkElement> {
--- a/servo/components/script/dom/htmlmapelement.rs
+++ b/servo/components/script/dom/htmlmapelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLMapElement {
 }

 impl HTMLMapElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLMapElement {
        HTMLMapElement {
@ -24,7 +25,7 @@ impl HTMLMapElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLMapElement> {
        let element = HTMLMapElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlmediaelement.rs
+++ b/servo/components/script/dom/htmlmediaelement.rs
@ -4,6 +4,7 @@

 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -12,7 +13,7 @@ pub struct HTMLMediaElement {
 }

 impl HTMLMediaElement {
-    pub fn new_inherited(tag_name: DOMString,
+    pub fn new_inherited(tag_name: Atom,
                         prefix: Option<DOMString>, document: &Document)
                         -> HTMLMediaElement {
        HTMLMediaElement {
--- a/servo/components/script/dom/htmlmetaelement.rs
+++ b/servo/components/script/dom/htmlmetaelement.rs
@ -14,6 +14,7 @@ use dom::node::{Node, document_from_node};
 use dom::virtualmethods::VirtualMethods;
 use std::ascii::AsciiExt;
 use std::sync::Arc;
+use string_cache::Atom;
 use style::stylesheets::{CSSRule, Origin, Stylesheet};
 use style::viewport::ViewportRule;
 use util::str::{DOMString, HTML_SPACE_CHARACTERS};
@ -25,7 +26,7 @@ pub struct HTMLMetaElement {
 }

 impl HTMLMetaElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLMetaElement {
        HTMLMetaElement {
@ -35,7 +36,7 @@ impl HTMLMetaElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLMetaElement> {
        let element = HTMLMetaElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlmeterelement.rs
+++ b/servo/components/script/dom/htmlmeterelement.rs
@ -9,6 +9,7 @@ use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
 use dom::nodelist::NodeList;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -17,7 +18,7 @@ pub struct HTMLMeterElement {
 }

 impl HTMLMeterElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLMeterElement {
        HTMLMeterElement {
@ -26,7 +27,7 @@ impl HTMLMeterElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLMeterElement> {
        let element = HTMLMeterElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlmodelement.rs
+++ b/servo/components/script/dom/htmlmodelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLModElement {
 }

 impl HTMLModElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLModElement {
        HTMLModElement {
@ -25,7 +26,7 @@ impl HTMLModElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLModElement> {
        let element = HTMLModElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlobjectelement.rs
+++ b/servo/components/script/dom/htmlobjectelement.rs
@ -17,6 +17,7 @@ use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 use net_traits::image::base::Image;
 use std::sync::Arc;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -26,7 +27,7 @@ pub struct HTMLObjectElement {
 }

 impl HTMLObjectElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLObjectElement {
        HTMLObjectElement {
@ -37,7 +38,7 @@ impl HTMLObjectElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLObjectElement> {
        let element = HTMLObjectElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlolistelement.rs
+++ b/servo/components/script/dom/htmlolistelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLOListElement {
 }

 impl HTMLOListElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLOListElement {
        HTMLOListElement {
@ -24,7 +25,7 @@ impl HTMLOListElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLOListElement> {
        let element = HTMLOListElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmloptgroupelement.rs
+++ b/servo/components/script/dom/htmloptgroupelement.rs
@ -14,6 +14,7 @@ use dom::htmloptionelement::HTMLOptionElement;
 use dom::node::Node;
 use dom::virtualmethods::VirtualMethods;
 use selectors::states::*;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -22,7 +23,7 @@ pub struct HTMLOptGroupElement {
 }

 impl HTMLOptGroupElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLOptGroupElement {
        HTMLOptGroupElement {
@ -33,7 +34,7 @@ impl HTMLOptGroupElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLOptGroupElement> {
        let element = HTMLOptGroupElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmloptionelement.rs
+++ b/servo/components/script/dom/htmloptionelement.rs
@ -20,6 +20,7 @@ use dom::text::Text;
 use dom::virtualmethods::VirtualMethods;
 use selectors::states::*;
 use std::cell::Cell;
+use string_cache::Atom;
 use util::str::{DOMString, split_html_space_chars, str_join};

 #[dom_struct]
@ -34,7 +35,7 @@ pub struct HTMLOptionElement {
 }

 impl HTMLOptionElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLOptionElement {
        HTMLOptionElement {
@ -47,7 +48,7 @@ impl HTMLOptionElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLOptionElement> {
        let element = HTMLOptionElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmloutputelement.rs
+++ b/servo/components/script/dom/htmloutputelement.rs
@ -12,6 +12,7 @@ use dom::htmlformelement::{FormControl, HTMLFormElement};
 use dom::node::{Node, window_from_node};
 use dom::nodelist::NodeList;
 use dom::validitystate::ValidityState;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -20,7 +21,7 @@ pub struct HTMLOutputElement {
 }

 impl HTMLOutputElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLOutputElement {
        HTMLOutputElement {
@ -30,7 +31,7 @@ impl HTMLOutputElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLOutputElement> {
        let element = HTMLOutputElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlparagraphelement.rs
+++ b/servo/components/script/dom/htmlparagraphelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLParagraphElement {
 }

 impl HTMLParagraphElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLParagraphElement {
        HTMLParagraphElement {
@ -25,7 +26,7 @@ impl HTMLParagraphElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLParagraphElement> {
        let element = HTMLParagraphElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlparamelement.rs
+++ b/servo/components/script/dom/htmlparamelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLParamElement {
 }

 impl HTMLParamElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLParamElement {
        HTMLParamElement {
@ -25,7 +26,7 @@ impl HTMLParamElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLParamElement> {
        let element = HTMLParamElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlpreelement.rs
+++ b/servo/components/script/dom/htmlpreelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLPreElement {
 }

 impl HTMLPreElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLPreElement {
        HTMLPreElement {
@ -25,7 +26,7 @@ impl HTMLPreElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLPreElement> {
        let element = HTMLPreElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlprogresselement.rs
+++ b/servo/components/script/dom/htmlprogresselement.rs
@ -9,6 +9,7 @@ use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
 use dom::nodelist::NodeList;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -17,7 +18,7 @@ pub struct HTMLProgressElement {
 }

 impl HTMLProgressElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLProgressElement {
        HTMLProgressElement {
@ -27,7 +28,7 @@ impl HTMLProgressElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLProgressElement> {
        let element = HTMLProgressElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlquoteelement.rs
+++ b/servo/components/script/dom/htmlquoteelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLQuoteElement {
 }

 impl HTMLQuoteElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLQuoteElement {
        HTMLQuoteElement {
@ -25,7 +26,7 @@ impl HTMLQuoteElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLQuoteElement> {
        let element = HTMLQuoteElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlscriptelement.rs
+++ b/servo/components/script/dom/htmlscriptelement.rs
@ -40,6 +40,7 @@ use std::ascii::AsciiExt;
 use std::cell::Cell;
 use std::mem;
 use std::sync::{Arc, Mutex};
+use string_cache::Atom;
 use url::{Url, UrlParser};
 use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};

@ -73,7 +74,7 @@ pub struct HTMLScriptElement {
 }

 impl HTMLScriptElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document,
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document,
                     creator: ElementCreator) -> HTMLScriptElement {
        HTMLScriptElement {
            htmlelement:
@ -89,7 +90,7 @@ impl HTMLScriptElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document,
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document,
               creator: ElementCreator) -> Root<HTMLScriptElement> {
        let element = HTMLScriptElement::new_inherited(localName, prefix, document, creator);
        Node::reflect_node(box element, document, HTMLScriptElementBinding::Wrap)
--- a/servo/components/script/dom/htmlselectelement.rs
+++ b/servo/components/script/dom/htmlselectelement.rs
@ -32,7 +32,7 @@ pub struct HTMLSelectElement {
 static DEFAULT_SELECT_SIZE: u32 = 0;

 impl HTMLSelectElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLSelectElement {
        HTMLSelectElement {
@ -43,7 +43,7 @@ impl HTMLSelectElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLSelectElement> {
        let element = HTMLSelectElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlsourceelement.rs
+++ b/servo/components/script/dom/htmlsourceelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLSourceElement {
 }

 impl HTMLSourceElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLSourceElement {
        HTMLSourceElement {
@ -25,7 +26,7 @@ impl HTMLSourceElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLSourceElement> {
        let element = HTMLSourceElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlspanelement.rs
+++ b/servo/components/script/dom/htmlspanelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLSpanElement {
 }

 impl HTMLSpanElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLSpanElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLSpanElement {
        HTMLSpanElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLSpanElement> {
        let element = HTMLSpanElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlstyleelement.rs
+++ b/servo/components/script/dom/htmlstyleelement.rs
@ -15,6 +15,7 @@ use dom::node::{ChildrenMutation, Node, document_from_node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use layout_interface::{LayoutChan, Msg};
 use std::sync::Arc;
+use string_cache::Atom;
 use style::media_queries::parse_media_query_list;
 use style::stylesheets::{Origin, Stylesheet};
 use util::str::DOMString;
@ -26,7 +27,7 @@ pub struct HTMLStyleElement {
 }

 impl HTMLStyleElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLStyleElement {
        HTMLStyleElement {
@ -36,7 +37,7 @@ impl HTMLStyleElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLStyleElement> {
        let element = HTMLStyleElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltablecaptionelement.rs
+++ b/servo/components/script/dom/htmltablecaptionelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLTableCaptionElement {
 }

 impl HTMLTableCaptionElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLTableCaptionElement {
        HTMLTableCaptionElement {
@ -25,7 +26,7 @@ impl HTMLTableCaptionElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTableCaptionElement> {
        let element = HTMLTableCaptionElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltablecellelement.rs
+++ b/servo/components/script/dom/htmltablecellelement.rs
@ -27,7 +27,7 @@ pub struct HTMLTableCellElement {
 }

 impl HTMLTableCellElement {
-    pub fn new_inherited(tag_name: DOMString,
+    pub fn new_inherited(tag_name: Atom,
                         prefix: Option<DOMString>,
                         document: &Document)
                         -> HTMLTableCellElement {
--- a/servo/components/script/dom/htmltablecolelement.rs
+++ b/servo/components/script/dom/htmltablecolelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLTableColElement {
 }

 impl HTMLTableColElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLTableColElement {
        HTMLTableColElement {
@ -25,7 +26,7 @@ impl HTMLTableColElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTableColElement> {
        let element = HTMLTableColElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltabledatacellelement.rs
+++ b/servo/components/script/dom/htmltabledatacellelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmltablecellelement::HTMLTableCellElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLTableDataCellElement {
 }

 impl HTMLTableDataCellElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLTableDataCellElement {
        HTMLTableDataCellElement {
@ -25,7 +26,7 @@ impl HTMLTableDataCellElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document)
               -> Root<HTMLTableDataCellElement> {
        Node::reflect_node(box HTMLTableDataCellElement::new_inherited(localName,
                                                                       prefix,
--- a/servo/components/script/dom/htmltableelement.rs
+++ b/servo/components/script/dom/htmltableelement.rs
@ -29,7 +29,7 @@ pub struct HTMLTableElement {
 }

 impl HTMLTableElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document)
                     -> HTMLTableElement {
        HTMLTableElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
@ -40,7 +40,7 @@ impl HTMLTableElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document)
               -> Root<HTMLTableElement> {
        let element = HTMLTableElement::new_inherited(localName, prefix, document);
        Node::reflect_node(box element, document, HTMLTableElementBinding::Wrap)
@ -75,7 +75,7 @@ impl HTMLTableElementMethods for HTMLTableElement {
        let caption = match self.GetCaption() {
            Some(caption) => caption,
            None => {
-                let caption = HTMLTableCaptionElement::new(DOMString::from("caption"),
+                let caption = HTMLTableCaptionElement::new(atom!("caption"),
                                                           None,
                                                           document_from_node(self).r());
                self.SetCaption(Some(caption.r()));
@ -94,7 +94,7 @@ impl HTMLTableElementMethods for HTMLTableElement {

    // https://html.spec.whatwg.org/multipage/#dom-table-createtbody
    fn CreateTBody(&self) -> Root<HTMLTableSectionElement> {
-        let tbody = HTMLTableSectionElement::new(DOMString::from("tbody"),
+        let tbody = HTMLTableSectionElement::new(atom!("tbody"),
                                                 None,
                                                 document_from_node(self).r());
        let node = self.upcast::<Node>();
--- a/servo/components/script/dom/htmltableheadercellelement.rs
+++ b/servo/components/script/dom/htmltableheadercellelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmltablecellelement::HTMLTableCellElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLTableHeaderCellElement {
 }

 impl HTMLTableHeaderCellElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLTableHeaderCellElement {
        HTMLTableHeaderCellElement {
@ -25,7 +26,7 @@ impl HTMLTableHeaderCellElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTableHeaderCellElement> {
        let element = HTMLTableHeaderCellElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltablerowelement.rs
+++ b/servo/components/script/dom/htmltablerowelement.rs
@ -37,7 +37,7 @@ pub struct HTMLTableRowElement {
 }

 impl HTMLTableRowElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document)
                     -> HTMLTableRowElement {
        HTMLTableRowElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
@ -46,7 +46,7 @@ impl HTMLTableRowElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document)
               -> Root<HTMLTableRowElement> {
        Node::reflect_node(box HTMLTableRowElement::new_inherited(localName, prefix, document),
                           document,
@ -76,7 +76,7 @@ impl HTMLTableRowElementMethods for HTMLTableRowElement {
        node.insert_cell_or_row(
            index,
            || self.Cells(),
-            || HTMLTableDataCellElement::new(DOMString::from("td"), None, node.owner_doc().r()))
+            || HTMLTableDataCellElement::new(atom!("td"), None, node.owner_doc().r()))
    }

    // https://html.spec.whatwg.org/multipage/#dom-tr-deletecell
--- a/servo/components/script/dom/htmltablesectionelement.rs
+++ b/servo/components/script/dom/htmltablesectionelement.rs
@ -25,7 +25,7 @@ pub struct HTMLTableSectionElement {
 }

 impl HTMLTableSectionElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document)
                     -> HTMLTableSectionElement {
        HTMLTableSectionElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document),
@ -33,7 +33,7 @@ impl HTMLTableSectionElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString, prefix: Option<DOMString>, document: &Document)
+    pub fn new(localName: Atom, prefix: Option<DOMString>, document: &Document)
               -> Root<HTMLTableSectionElement> {
        let element = HTMLTableSectionElement::new_inherited(localName, prefix, document);
        Node::reflect_node(box element, document, HTMLTableSectionElementBinding::Wrap)
@ -61,7 +61,7 @@ impl HTMLTableSectionElementMethods for HTMLTableSectionElement {
        node.insert_cell_or_row(
            index,
            || self.Rows(),
-            || HTMLTableRowElement::new(DOMString::from("tr"), None, node.owner_doc().r()))
+            || HTMLTableRowElement::new(atom!("tr"), None, node.owner_doc().r()))
    }

    // https://html.spec.whatwg.org/multipage/#dom-tbody-deleterow
--- a/servo/components/script/dom/htmltemplateelement.rs
+++ b/servo/components/script/dom/htmltemplateelement.rs
@ -13,6 +13,7 @@ use dom::documentfragment::DocumentFragment;
 use dom::htmlelement::HTMLElement;
 use dom::node::{CloneChildrenFlag, Node, document_from_node};
 use dom::virtualmethods::VirtualMethods;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -24,7 +25,7 @@ pub struct HTMLTemplateElement {
 }

 impl HTMLTemplateElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLTemplateElement {
        HTMLTemplateElement {
@ -35,7 +36,7 @@ impl HTMLTemplateElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTemplateElement> {
        let element = HTMLTemplateElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltextareaelement.rs
+++ b/servo/components/script/dom/htmltextareaelement.rs
@ -91,7 +91,7 @@ static DEFAULT_COLS: u32 = 20;
 static DEFAULT_ROWS: u32 = 2;

 impl HTMLTextAreaElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLTextAreaElement {
        let chan = document.window().constellation_chan();
@ -107,7 +107,7 @@ impl HTMLTextAreaElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTextAreaElement> {
        let element = HTMLTextAreaElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltimeelement.rs
+++ b/servo/components/script/dom/htmltimeelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLTimeElement {
 }

 impl HTMLTimeElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLTimeElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLTimeElement {
        HTMLTimeElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTimeElement> {
        let element = HTMLTimeElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltitleelement.rs
+++ b/servo/components/script/dom/htmltitleelement.rs
@ -13,6 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{ChildrenMutation, Node};
 use dom::text::Text;
 use dom::virtualmethods::VirtualMethods;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -21,14 +22,14 @@ pub struct HTMLTitleElement {
 }

 impl HTMLTitleElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLTitleElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLTitleElement {
        HTMLTitleElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTitleElement> {
        let element = HTMLTitleElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmltrackelement.rs
+++ b/servo/components/script/dom/htmltrackelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLTrackElement {
 }

 impl HTMLTrackElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLTrackElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLTrackElement {
        HTMLTrackElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLTrackElement> {
        let element = HTMLTrackElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlulistelement.rs
+++ b/servo/components/script/dom/htmlulistelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,14 +16,14 @@ pub struct HTMLUListElement {
 }

 impl HTMLUListElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLUListElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLUListElement {
        HTMLUListElement {
            htmlelement: HTMLElement::new_inherited(localName, prefix, document)
        }
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLUListElement> {
        let element = HTMLUListElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlunknownelement.rs
+++ b/servo/components/script/dom/htmlunknownelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlelement::HTMLElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLUnknownElement {
 }

 impl HTMLUnknownElement {
-    fn new_inherited(localName: DOMString,
+    fn new_inherited(localName: Atom,
                     prefix: Option<DOMString>,
                     document: &Document) -> HTMLUnknownElement {
        HTMLUnknownElement {
@ -25,7 +26,7 @@ impl HTMLUnknownElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLUnknownElement> {
        let element = HTMLUnknownElement::new_inherited(localName, prefix, document);
--- a/servo/components/script/dom/htmlvideoelement.rs
+++ b/servo/components/script/dom/htmlvideoelement.rs
@ -7,6 +7,7 @@ use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::htmlmediaelement::HTMLMediaElement;
 use dom::node::Node;
+use string_cache::Atom;
 use util::str::DOMString;

 #[dom_struct]
@ -15,7 +16,7 @@ pub struct HTMLVideoElement {
 }

 impl HTMLVideoElement {
-    fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: &Document) -> HTMLVideoElement {
+    fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document) -> HTMLVideoElement {
        HTMLVideoElement {
            htmlmediaelement:
                HTMLMediaElement::new_inherited(localName, prefix, document)
@ -23,7 +24,7 @@ impl HTMLVideoElement {
    }

    #[allow(unrooted_must_root)]
-    pub fn new(localName: DOMString,
+    pub fn new(localName: Atom,
               prefix: Option<DOMString>,
               document: &Document) -> Root<HTMLVideoElement> {
        let element = HTMLVideoElement::new_inherited(localName, prefix, document);