Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify Element::set_attribute for its remaining callers.

Browse source
This commit is contained in:
Ms2ger 2014-06-08 14:42:34 +02:00
parent efe69f3a82
commit 37e9458514
1 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/components/script/dom/element.rs
View file

@ -222,8 +222,7 @@ pub trait AttributeHandlers {
fn set_attribute_from_parser(&self, local_name: DOMString, fn set_attribute_from_parser(&self, local_name: DOMString,
value: DOMString, namespace: Namespace, value: DOMString, namespace: Namespace,
prefix: Option<DOMString>); prefix: Option<DOMString>);
fn set_attribute(&self, namespace: Namespace, name: DOMString, fn set_attribute(&self, name: &str, value: DOMString);
value: DOMString) -> ErrorResult;
fn do_set_attribute(&self, local_name: DOMString, value: DOMString, fn do_set_attribute(&self, local_name: DOMString, value: DOMString,
name: DOMString, namespace: Namespace, name: DOMString, namespace: Namespace,
prefix: Option<DOMString>, cb: |&JSRef<Attr>| -> bool); prefix: Option<DOMString>, cb: |&JSRef<Attr>| -> bool);
@ -266,31 +265,16 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
self.do_set_attribute(local_name, value, name, namespace, prefix, |_| false) self.do_set_attribute(local_name, value, name, namespace, prefix, |_| false)
} }
fn set_attribute(&self, namespace: Namespace, name: DOMString, fn set_attribute(&self, name: &str, value: DOMString) {
value: DOMString) -> ErrorResult { assert!(name == name.to_ascii_lower().as_slice());
let (prefix, local_name) = get_attribute_parts(name.clone()); assert!(!name.contains(":"));
match prefix {
Some(ref prefix_str) => {
if namespace == namespace::Null ||
("xml" == prefix_str.as_slice() && namespace != namespace::XML) ||
("xmlns" == prefix_str.as_slice() && namespace != namespace::XMLNS) {
return Err(NamespaceError);
}
},
None => {}
}
let node: &JSRef<Node> = NodeCast::from_ref(self); let node: &JSRef<Node> = NodeCast::from_ref(self);
node.wait_until_safe_to_modify_dom(); node.wait_until_safe_to_modify_dom();
let position: |&JSRef<Attr>| -> bool = self.do_set_attribute(name.to_string(), value, name.to_string(),
if self.html_element_in_html_document() { namespace::Null, None,
|attr| attr.deref().local_name.as_slice().eq_ignore_ascii_case(local_name.as_slice()) |attr| attr.deref().local_name.as_slice() == name);
} else {
|attr| attr.deref().local_name == local_name
};
self.do_set_attribute(name.clone(), value, name.clone(), namespace::Null, None, position);
Ok(())
} }
fn do_set_attribute(&self, local_name: DOMString, value: DOMString, fn do_set_attribute(&self, local_name: DOMString, value: DOMString,
@ -378,12 +362,12 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
} }
fn set_string_attribute(&self, name: &str, value: DOMString) { fn set_string_attribute(&self, name: &str, value: DOMString) {
assert!(name == name.to_ascii_lower().as_slice()); assert!(name == name.to_ascii_lower().as_slice());
assert!(self.set_attribute(Null, name.to_string(), value).is_ok()); self.set_attribute(name, value);
} }
fn set_uint_attribute(&self, name: &str, value: u32) { fn set_uint_attribute(&self, name: &str, value: u32) {
assert!(name == name.to_ascii_lower().as_slice()); assert!(name == name.to_ascii_lower().as_slice());
assert!(self.set_attribute(Null, name.to_string(), value.to_str()).is_ok()); self.set_attribute(name, value.to_str());
} }
} }