diff options
Diffstat (limited to 'components/script/dom/cssstyledeclaration.rs')
| -rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index b95df387901..81dd6aeeebe 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::CSSStyleDeclarationBinding::{mod, CSSStyleDeclarationMethods}; +use dom::bindings::codegen::Bindings::CSSStyleDeclarationBinding::{self, CSSStyleDeclarationMethods}; use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast}; use dom::bindings::error::Error; use dom::bindings::error::ErrorResult; @@ -21,6 +21,7 @@ use style::{is_supported_property, longhands_from_shorthand, parse_style_attribu use style::PropertyDeclaration; use std::ascii::AsciiExt; +use std::borrow::ToOwned; #[dom_struct] pub struct CSSStyleDeclaration { @@ -29,7 +30,7 @@ pub struct CSSStyleDeclaration { readonly: bool, } -#[deriving(PartialEq)] +#[derive(PartialEq)] pub enum CSSModificationAccess { ReadWrite, Readonly @@ -39,14 +40,14 @@ macro_rules! css_properties( ( $([$getter:ident, $setter:ident, $cssprop:expr]),* ) => ( $( fn $getter(self) -> DOMString { - self.GetPropertyValue($cssprop.into_string()) + self.GetPropertyValue($cssprop.to_owned()) } fn $setter(self, value: DOMString) { - self.SetPropertyValue($cssprop.into_string(), value).unwrap(); + self.SetPropertyValue($cssprop.to_owned(), value).unwrap(); } )* ); -) +); fn serialize_list(list: &Vec<PropertyDeclaration>) -> DOMString { let mut result = String::new(); @@ -115,21 +116,21 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { if index as uint > declarations.normal.len() { declarations.important .get(index as uint - declarations.normal.len()) - .map(|decl| format!("{} !important", decl)) + .map(|decl| format!("{:?} !important", decl)) } else { declarations.normal .get(index as uint) - .map(|decl| format!("{}", decl)) + .map(|decl| format!("{:?}", decl)) } }); - result.unwrap_or("".into_string()) + result.unwrap_or("".to_owned()) } // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-getpropertyvalue fn GetPropertyValue(self, property: DOMString) -> DOMString { // Step 1 - let property = Atom::from_slice(property.as_slice().to_ascii_lower().as_slice()); + let property = Atom::from_slice(property.as_slice().to_ascii_lowercase().as_slice()); // Step 2 let longhand_properties = longhands_from_shorthand(property.as_slice()); @@ -145,7 +146,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { // Step 2.2.2 & 2.2.3 match declaration { Some(declaration) => list.push(declaration), - None => return "".into_string(), + None => return "".to_owned(), } } @@ -157,14 +158,14 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { if let Some(ref declaration) = self.get_declaration(&property) { serialize_value(declaration) } else { - "".into_string() + "".to_owned() } } // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-getpropertypriority fn GetPropertyPriority(self, property: DOMString) -> DOMString { // Step 1 - let property = Atom::from_slice(property.as_slice().to_ascii_lower().as_slice()); + let property = Atom::from_slice(property.as_slice().to_ascii_lowercase().as_slice()); // Step 2 let longhand_properties = longhands_from_shorthand(property.as_slice()); @@ -174,15 +175,15 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { .map(|longhand| self.GetPropertyPriority(longhand.clone())) .all(|priority| priority.as_slice() == "important") { - return "important".into_string(); + return "important".to_owned(); } // Step 3 } else if self.get_important_declaration(&property).is_some() { - return "important".into_string(); + return "important".to_owned(); } // Step 4 - "".into_string() + "".to_owned() } // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-setproperty @@ -194,7 +195,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } // Step 2 - let property = property.as_slice().to_ascii_lower(); + let property = property.as_slice().to_ascii_lowercase(); // Step 3 if !is_supported_property(property.as_slice()) { @@ -207,7 +208,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } // Step 5 - let priority = priority.as_slice().to_ascii_lower(); + let priority = priority.as_slice().to_ascii_lowercase(); if priority.as_slice() != "!important" && !priority.is_empty() { return Ok(()); } @@ -253,7 +254,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } // Step 2 - let property = property.as_slice().to_ascii_lower(); + let property = property.as_slice().to_ascii_lowercase(); // Step 3 if !is_supported_property(property.as_slice()) { @@ -261,7 +262,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } // Step 4 - let priority = priority.as_slice().to_ascii_lower(); + let priority = priority.as_slice().to_ascii_lowercase(); if priority.as_slice() != "important" && !priority.is_empty() { return Ok(()); } @@ -289,7 +290,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-setpropertyvalue fn SetPropertyValue(self, property: DOMString, value: DOMString) -> ErrorResult { - self.SetProperty(property, value, "".into_string()) + self.SetProperty(property, value, "".to_owned()) } // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-removeproperty @@ -300,7 +301,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } // Step 2 - let property = property.as_slice().to_ascii_lower(); + let property = property.as_slice().to_ascii_lowercase(); // Step 3 let value = self.GetPropertyValue(property.clone()); @@ -328,12 +329,12 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-cssfloat fn CssFloat(self) -> DOMString { - self.GetPropertyValue("float".into_string()) + self.GetPropertyValue("float".to_owned()) } // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-cssfloat fn SetCssFloat(self, value: DOMString) -> ErrorResult { - self.SetPropertyValue("float".into_string(), value) + self.SetPropertyValue("float".to_owned(), value) } fn IndexedGetter(self, index: u32, found: &mut bool) -> DOMString { @@ -342,5 +343,5 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { rval } - css_properties_accessors!(css_properties) + css_properties_accessors!(css_properties); } |