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

auto merge of #2591 : brunoabinader/servo/document-queryselector-v3, r=jdm

Browse source 
This is a subtask for #2254 & #2576.

Spec:
http://dom.spec.whatwg.org/#dom-parentnode-queryselector
This commit is contained in:
bors-servo 2014-06-06 17:22:25 -04:00
commit b52fbe0a5f
9 changed files with 226 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,6 +196,8 @@ impl LayoutElementHelpers for JS<Element> {
pub trait ElementHelpers {
fn html_element_in_html_document(&self) -> bool;
fn get_local_name<'a>(&'a self) -> &'a str;
fn get_namespace<'a>(&'a self) -> &'a Namespace;
}
impl<'a> ElementHelpers for JSRef<'a, Element> {
@ -204,6 +206,14 @@ impl<'a> ElementHelpers for JSRef<'a, Element> {
let node: &JSRef<Node> = NodeCast::from_ref(self);
is_html && node.owner_doc().root().is_html_document
}
fn get_local_name<'a>(&'a self) -> &'a str {
self.deref().local_name.as_slice()
}
fn get_namespace<'a>(&'a self) -> &'a Namespace {
&self.deref().namespace
}
}
pub trait AttributeHandlers {
@ -418,6 +428,7 @@ pub trait ElementMethods {
fn GetInnerHTML(&self) -> Fallible<DOMString>;
fn GetOuterHTML(&self) -> Fallible<DOMString>;
fn Children(&self) -> Temporary<HTMLCollection>;
fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>>;
fn Remove(&self);
}
@ -688,11 +699,18 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
Ok(serialize(&mut NodeIterator::new(NodeCast::from_ref(self), true, false)))
}
// http://dom.spec.whatwg.org/#dom-parentnode-children
fn Children(&self) -> Temporary<HTMLCollection> {
let window = window_from_node(self).root();
HTMLCollection::children(&*window, NodeCast::from_ref(self))
}
// http://dom.spec.whatwg.org/#dom-parentnode-queryselector
fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> {
let root: &JSRef<Node> = NodeCast::from_ref(self);
root.query_selector(selectors)
}
// http://dom.spec.whatwg.org/#dom-childnode-remove
fn Remove(&self) {
let node: &JSRef<Node> = NodeCast::from_ref(self);
@ -799,3 +817,33 @@ impl<'a> VirtualMethods for JSRef<'a, Element> {
}
}
}
impl<'a> style::TElement for JSRef<'a, Element> {
fn get_attr(&self, namespace: &Namespace, attr: &str) -> Option<&'static str> {
self.get_attribute(namespace.clone(), attr).root().map(|attr| {
unsafe { mem::transmute(attr.deref().value_ref()) }
})
}
fn get_link(&self) -> Option<&'static str> {
// FIXME: This is HTML only.
let node: &JSRef<Node> = NodeCast::from_ref(self);
match node.type_id() {
// http://www.whatwg.org/specs/web-apps/current-work/multipage/selectors.html#
// selector-link
ElementNodeTypeId(HTMLAnchorElementTypeId) |
ElementNodeTypeId(HTMLAreaElementTypeId) |
ElementNodeTypeId(HTMLLinkElementTypeId) => self.get_attr(&namespace::Null, "href"),
_ => None,
}
}
fn get_local_name<'a>(&'a self) -> &'a str {
(self as &ElementHelpers).get_local_name()
}
fn get_namespace<'a>(&'a self) -> &'a Namespace {
(self as &ElementHelpers).get_namespace()
}
fn get_hover_state(&self) -> bool {
let node: &JSRef<Node> = NodeCast::from_ref(self);
node.get_hover_state()
}
}