auto merge of #2048 : Ms2ger/servo/set_uint_attribute, r=jdm

3 files changed, 10 insertions, 6 deletions

diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index fca1f9ad78c..8299f516119 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -206,6 +206,7 @@ pub trait AttributeHandlers {
     fn set_url_attribute(&mut self, name: &str, value: DOMString);
     fn get_string_attribute(&self, name: &str) -> DOMString;
     fn set_string_attribute(&mut self, name: &str, value: DOMString);
+    fn set_uint_attribute(&mut self, name: &str, value: u32);
 }
 
 pub trait AfterSetAttrListener {
@@ -418,6 +419,11 @@ impl AttributeHandlers for JS<Element> {
         assert!(name == name.to_ascii_lower());
         assert!(self.set_attribute(Null, name.to_owned(), value).is_ok());
     }
+
+    fn set_uint_attribute(&mut self, name: &str, value: u32) {
+        assert!(name == name.to_ascii_lower());
+        assert!(self.set_attribute(Null, name.to_owned(), value.to_str()).is_ok());
+    }
 }
 
 impl Element {
diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs
index f0ceeb89434..1fcd4a9a0a5 100644
--- a/src/components/script/dom/htmlimageelement.rs
+++ b/src/components/script/dom/htmlimageelement.rs
@@ -144,9 +144,9 @@ impl HTMLImageElement {
         to_px(rect.size.width) as u32
     }
 
-    pub fn SetWidth(&mut self, abstract_self: &JS<HTMLImageElement>, width: u32) -> ErrorResult {
+    pub fn SetWidth(&mut self, abstract_self: &JS<HTMLImageElement>, width: u32) {
         let mut elem: JS<Element> = ElementCast::from(abstract_self);
-        elem.set_attr(~"width", width.to_str())
+        elem.set_uint_attribute("width", width)
     }
 
     pub fn Height(&self, abstract_self: &JS<HTMLImageElement>) -> u32 {
@@ -160,9 +160,9 @@ impl HTMLImageElement {
         to_px(rect.size.height) as u32
     }
 
-    pub fn SetHeight(&mut self, abstract_self: &JS<HTMLImageElement>, height: u32) -> ErrorResult {
+    pub fn SetHeight(&mut self, abstract_self: &JS<HTMLImageElement>, height: u32) {
         let mut elem: JS<Element> = ElementCast::from(abstract_self);
-        elem.set_attr(~"height", height.to_str())
+        elem.set_uint_attribute("height", height)
     }
 
     pub fn NaturalWidth(&self) -> u32 {
diff --git a/src/components/script/dom/webidls/HTMLImageElement.webidl b/src/components/script/dom/webidls/HTMLImageElement.webidl
index 700bd20d949..2131124b856 100644
--- a/src/components/script/dom/webidls/HTMLImageElement.webidl
+++ b/src/components/script/dom/webidls/HTMLImageElement.webidl
@@ -23,9 +23,7 @@ interface HTMLImageElement : HTMLElement {
            attribute DOMString useMap;
            [SetterThrows]
            attribute boolean isMap;
-           [SetterThrows]
            attribute unsigned long width;
-           [SetterThrows]
            attribute unsigned long height;
   readonly attribute unsigned long naturalWidth;
   readonly attribute unsigned long naturalHeight;