From 9faa2de0fcb6e7d13528c998f2405a80ccbefc56 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 14 Sep 2015 10:33:16 +0200 Subject: [PATCH] Use static atoms in some places. --- components/script/dom/htmlinputelement.rs | 2 +- components/script/dom/htmlscriptelement.rs | 5 ++--- components/style/properties.mako.rs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index d0facdaa1a5..e02d43c8278 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -520,7 +520,7 @@ impl VirtualMethods for HTMLInputElement { self.radio_group_updated( mutation.new_value(attr).as_ref().map(|value| &***value)); }, - name if name == &Atom::from_slice("placeholder") => { + &atom!(placeholder) => { let mut placeholder = self.placeholder.borrow_mut(); placeholder.clear(); if let AttributeMutation::Set(_) = mutation { diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index c70a0d3541b..815ef46ea64 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -45,7 +45,6 @@ use net_traits::{Metadata, AsyncResponseListener, AsyncResponseTarget}; use std::cell::{RefCell, 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}; @@ -233,7 +232,7 @@ impl HTMLScriptElement { // Step 12. let for_attribute = element.get_attribute(&ns!(""), &atom!("for")); - let event_attribute = element.get_attribute(&ns!(""), &Atom::from_slice("event")); + let event_attribute = element.get_attribute(&ns!(""), &atom!("event")); match (for_attribute.r(), event_attribute.r()) { (Some(for_attribute), Some(event_attribute)) => { let for_value = for_attribute.value().to_ascii_lowercase(); @@ -252,7 +251,7 @@ impl HTMLScriptElement { } // Step 13. - if let Some(ref charset) = element.get_attribute(&ns!(""), &Atom::from_slice("charset")) { + if let Some(ref charset) = element.get_attribute(&ns!(""), &atom!("charset")) { if let Some(encodingRef) = encoding_from_whatwg_label(&charset.r().Value()) { *self.block_character_encoding.borrow_mut() = encodingRef; } diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs index 879a2aea195..5b4d765fa08 100644 --- a/components/style/properties.mako.rs +++ b/components/style/properties.mako.rs @@ -1759,7 +1759,7 @@ pub mod longhands { #[inline] pub fn get_initial_value() -> computed_value::T { - computed_value::T(vec![FontFamily::FamilyName(Atom::from_slice("serif"))]) + computed_value::T(vec![FontFamily::FamilyName(atom!("serif"))]) } /// # /// = | [ + ]