Add macro for reflecting URLs

3 files changed, 32 insertions, 15 deletions

diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index bf2fd4f2de4..964b17e0784 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -7,14 +7,13 @@ use dom::bindings::codegen::Bindings::HTMLFormElementBinding::HTMLFormElementMet
 use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFormElementDerived};
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflectable, Reflector};
-use dom::document::{Document, DocumentHelpers};
+use dom::document::Document;
 use dom::element::{Element, AttributeHandlers, HTMLFormElementTypeId};
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::htmlelement::HTMLElement;
-use dom::node::{Node, ElementNodeTypeId, document_from_node};
+use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 use std::ascii::OwnedStrAsciiExt;
-use url::UrlParser;
 
 
 #[jstraceable]
@@ -51,17 +50,7 @@ impl<'a> HTMLFormElementMethods for JSRef<'a, HTMLFormElement> {
     make_setter!(SetAcceptCharset, "accept-charset")
 
     // https://html.spec.whatwg.org/multipage/forms.html#dom-fs-action
-    fn Action(self) -> DOMString {
-        let elem: JSRef<Element> = ElementCast::from_ref(self);
-        let action = elem.get_string_attribute("action");
-        let doc = document_from_node(self).root();
-        let base = doc.url();
-        // https://html.spec.whatwg.org/multipage/infrastructure.html#reflect
-        match UrlParser::new().base_url(base).parse(action.as_slice()) {
-            Ok(parsed) => parsed.serialize(),
-            Err(_) => base.serialize()
-        }
-    }
+    make_url_getter!(Action)
 
     // https://html.spec.whatwg.org/multipage/forms.html#dom-fs-action
     make_setter!(SetAction, "action")
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 92e7288b81d..859a1b16871 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -100,7 +100,7 @@ impl<'a> HTMLImageElementMethods for JSRef<'a, HTMLImageElement> {
 
     make_setter!(SetAlt, "alt")
 
-    make_getter!(Src)
+    make_url_getter!(Src)
 
     make_setter!(SetSrc, "src")
 
diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index 40b150da6c8..22b93a7eb07 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -53,6 +53,34 @@ macro_rules! make_uint_getter(
     }
 )
 
+#[macro_export]
+macro_rules! make_url_getter(
+    ( $attr:ident, $htmlname:expr ) => (
+        fn $attr(self) -> DOMString {
+            use dom::element::{Element, AttributeHandlers};
+            use dom::bindings::codegen::InheritTypes::ElementCast;
+            use dom::document::DocumentHelpers;
+            use dom::node::document_from_node;
+            use url::UrlParser;
+            #[allow(unused_imports)]
+            use std::ascii::StrAsciiExt;
+            let elem: JSRef<Element> = ElementCast::from_ref(self);
+            let action = elem.get_string_attribute($htmlname);
+            let doc = document_from_node(self).root();
+            let base = doc.url();
+            // https://html.spec.whatwg.org/multipage/infrastructure.html#reflect
+            // XXXManishearth this doesn't handle `javascript:` urls properly
+            match UrlParser::new().base_url(base).parse(action.as_slice()) {
+                Ok(parsed) => parsed.serialize(),
+                Err(_) => base.serialize()
+            }
+        }
+    );
+    ($attr:ident) => {
+        make_url_getter!($attr, stringify!($attr).to_ascii_lower().as_slice())
+    }
+)
+
 // concat_idents! doesn't work for function name positions, so
 // we have to specify both the content name and the HTML name here
 #[macro_export]