From eb3678fa286fc2480624c977b1de5b60a971b3f7 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 15 Dec 2014 12:33:49 -0400 Subject: [PATCH] AttrValue's s/from_tokenlist/from_serialized_tokenlist/ --- components/script/dom/attr.rs | 2 +- components/script/dom/element.rs | 4 ++-- components/script/dom/htmlanchorelement.rs | 2 +- components/script/dom/htmlareaelement.rs | 2 +- components/script/dom/htmllinkelement.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index d1b288bd7ad..2b821371819 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -37,7 +37,7 @@ pub enum AttrValue { } impl AttrValue { - pub fn from_tokenlist(tokens: DOMString) -> AttrValue { + pub fn from_serialized_tokenlist(tokens: DOMString) -> AttrValue { let atoms = split_html_space_chars(tokens.as_slice()) .map(|token| Atom::from_slice(token)).collect(); AttrValue::TokenList(tokens, atoms) diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 52a16fc6ea4..ba6e94445a6 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -848,7 +848,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> { fn set_tokenlist_attribute(self, name: &Atom, value: DOMString) { assert!(name.as_slice() == name.as_slice().to_ascii_lower().as_slice()); - self.set_attribute(name, AttrValue::from_tokenlist(value)); + self.set_attribute(name, AttrValue::from_serialized_tokenlist(value)); } fn get_uint_attribute(self, name: &Atom) -> u32 { @@ -1290,7 +1290,7 @@ impl<'a> VirtualMethods for JSRef<'a, Element> { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { match name { &atom!("id") => AttrValue::from_atomic(value), - &atom!("class") => AttrValue::from_tokenlist(value), + &atom!("class") => AttrValue::from_serialized_tokenlist(value), _ => self.super_type().unwrap().parse_plain_attribute(name, value), } } diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 10d574672a3..c4e9558c359 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -93,7 +93,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLAnchorElement> { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { match name { - &atom!("rel") => AttrValue::from_tokenlist(value), + &atom!("rel") => AttrValue::from_serialized_tokenlist(value), _ => self.super_type().unwrap().parse_plain_attribute(name, value), } } diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index 1ede87d380d..4871f35dc2d 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -58,7 +58,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLAreaElement> { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { match name { - &atom!("rel") => AttrValue::from_tokenlist(value), + &atom!("rel") => AttrValue::from_serialized_tokenlist(value), _ => self.super_type().unwrap().parse_plain_attribute(name, value), } } diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index f84314b7008..1105d60c6c6 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -94,7 +94,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLLinkElement> { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { match name { - &atom!("rel") => AttrValue::from_tokenlist(value), + &atom!("rel") => AttrValue::from_serialized_tokenlist(value), _ => self.super_type().unwrap().parse_plain_attribute(name, value), } }