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

Merge pull request #2905 from brunoabinader/element-removeattr-no-throw

Browse source 
Element::removeAttribute* does not need to throw
This commit is contained in:
Manish Goregaokar 2014-07-23 19:58:24 +05:30
commit f44f974f91
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -233,7 +233,7 @@ pub trait AttributeHandlers {
fn parse_attribute(&self, namespace: &Namespace, local_name: &str, fn parse_attribute(&self, namespace: &Namespace, local_name: &str,
value: DOMString) -> AttrValue; value: DOMString) -> AttrValue;
fn remove_attribute(&self, namespace: Namespace, name: &str) -> ErrorResult; fn remove_attribute(&self, namespace: Namespace, name: &str);
fn notify_attribute_changed(&self, local_name: DOMString); fn notify_attribute_changed(&self, local_name: DOMString);
fn has_class(&self, name: &str) -> bool; fn has_class(&self, name: &str) -> bool;
@ -316,7 +316,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
} }
} }
fn remove_attribute(&self, namespace: Namespace, name: &str) -> ErrorResult { fn remove_attribute(&self, namespace: Namespace, name: &str) {
let (_, local_name) = get_attribute_parts(name); let (_, local_name) = get_attribute_parts(name);
let idx = self.deref().attrs.borrow().iter().map(|attr| attr.root()).position(|attr| { let idx = self.deref().attrs.borrow().iter().map(|attr| attr.root()).position(|attr| {
@ -340,8 +340,6 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
self.deref().attrs.borrow_mut().remove(idx); self.deref().attrs.borrow_mut().remove(idx);
} }
}; };
Ok(())
} }
fn notify_attribute_changed(&self, local_name: DOMString) { fn notify_attribute_changed(&self, local_name: DOMString) {
@ -439,8 +437,8 @@ pub trait ElementMethods {
fn GetAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> Option<DOMString>; fn GetAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> Option<DOMString>;
fn SetAttribute(&self, name: DOMString, value: DOMString) -> ErrorResult; fn SetAttribute(&self, name: DOMString, value: DOMString) -> ErrorResult;
fn SetAttributeNS(&self, namespace_url: Option<DOMString>, name: DOMString, value: DOMString) -> ErrorResult; fn SetAttributeNS(&self, namespace_url: Option<DOMString>, name: DOMString, value: DOMString) -> ErrorResult;
fn RemoveAttribute(&self, name: DOMString) -> ErrorResult; fn RemoveAttribute(&self, name: DOMString);
fn RemoveAttributeNS(&self, namespace: Option<DOMString>, localname: DOMString) -> ErrorResult; fn RemoveAttributeNS(&self, namespace: Option<DOMString>, localname: DOMString);
fn HasAttribute(&self, name: DOMString) -> bool; fn HasAttribute(&self, name: DOMString) -> bool;
fn HasAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> bool; fn HasAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> bool;
fn GetElementsByTagName(&self, localname: DOMString) -> Temporary<HTMLCollection>; fn GetElementsByTagName(&self, localname: DOMString) -> Temporary<HTMLCollection>;
@ -650,8 +648,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
} }
// http://dom.spec.whatwg.org/#dom-element-removeattribute // http://dom.spec.whatwg.org/#dom-element-removeattribute
fn RemoveAttribute(&self, fn RemoveAttribute(&self, name: DOMString) {
name: DOMString) -> ErrorResult {
let name = if self.html_element_in_html_document() { let name = if self.html_element_in_html_document() {
name.as_slice().to_ascii_lower() name.as_slice().to_ascii_lower()
} else { } else {
@ -663,7 +660,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
// http://dom.spec.whatwg.org/#dom-element-removeattributens // http://dom.spec.whatwg.org/#dom-element-removeattributens
fn RemoveAttributeNS(&self, fn RemoveAttributeNS(&self,
namespace: Option<DOMString>, namespace: Option<DOMString>,
localname: DOMString) -> ErrorResult { localname: DOMString) {
let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace)); let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace));
self.remove_attribute(namespace, localname.as_slice()) self.remove_attribute(namespace, localname.as_slice())
} }

2
src/components/script/dom/webidls/Element.webidl
View file

@ -39,9 +39,7 @@ interface Element : Node {
void setAttribute(DOMString name, DOMString value); void setAttribute(DOMString name, DOMString value);
[Throws] [Throws]
void setAttributeNS(DOMString? namespace, DOMString name, DOMString value); void setAttributeNS(DOMString? namespace, DOMString name, DOMString value);
[Throws]
void removeAttribute(DOMString name); void removeAttribute(DOMString name);
[Throws]
void removeAttributeNS(DOMString? namespace, DOMString localName); void removeAttributeNS(DOMString? namespace, DOMString localName);
boolean hasAttribute(DOMString name); boolean hasAttribute(DOMString name);
boolean hasAttributeNS(DOMString? namespace, DOMString localName); boolean hasAttributeNS(DOMString? namespace, DOMString localName);