Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add macro for reflecting URLs

Browse source
This commit is contained in:
Manish Goregaokar 2014-10-07 21:25:45 +05:30
parent e9f654d60a
commit 8cba6c7580
3 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/dom/htmlformelement.rs
View file

@ -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")

2
components/script/dom/htmlimageelement.rs
View file

@ -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")

28
components/script/dom/macros.rs
View file

@ -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]