diff options
Diffstat (limited to 'src/components/script/dom/element.rs')
-rw-r--r-- | src/components/script/dom/element.rs | 196 |
1 files changed, 85 insertions, 111 deletions
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 5be2466b80d..b06e3253989 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -7,9 +7,7 @@ use dom::attr::Attr; use dom::attrlist::AttrList; use dom::bindings::codegen::ElementBinding; -use dom::bindings::codegen::InheritTypes::{ElementDerived, HTMLImageElementCast}; -use dom::bindings::codegen::InheritTypes::{HTMLIFrameElementCast, NodeCast}; -use dom::bindings::codegen::InheritTypes::HTMLObjectElementCast; +use dom::bindings::codegen::InheritTypes::{ElementDerived, NodeCast}; use dom::bindings::js::JS; use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::error::{ErrorResult, Fallible, NamespaceError, InvalidCharacter}; @@ -19,11 +17,9 @@ use dom::clientrect::ClientRect; use dom::clientrectlist::ClientRectList; use dom::document::Document; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; -use dom::htmlimageelement::HTMLImageElement; -use dom::htmliframeelement::HTMLIFrameElement; -use dom::htmlobjectelement::HTMLObjectElement; use dom::node::{ElementNodeTypeId, Node, NodeHelpers, NodeIterator, document_from_node}; use dom::htmlserializer::serialize; +use dom::virtualmethods::{VirtualMethods, vtable_for}; use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery}; use layout_interface::{ContentBoxesResponse, ContentChangedDocumentDamage}; use layout_interface::{MatchSelectorsDocumentDamage}; @@ -202,9 +198,7 @@ pub trait AttributeHandlers { fn SetAttributeNS(&mut self, namespace_url: Option<DOMString>, name: DOMString, value: DOMString) -> ErrorResult; - fn after_set_attr(&mut self, local_name: DOMString, value: DOMString); fn remove_attribute(&mut self, namespace: Namespace, name: DOMString) -> ErrorResult; - fn before_remove_attr(&mut self, local_name: DOMString, old_value: DOMString); fn notify_attribute_changed(&self, local_name: DOMString); fn has_class(&self, name: &str) -> bool; @@ -216,14 +210,6 @@ pub trait AttributeHandlers { fn set_uint_attribute(&mut self, name: &str, value: u32); } -pub trait AfterSetAttrListener { - fn AfterSetAttr(&mut self, name: DOMString, value: DOMString); -} - -pub trait BeforeRemoveAttrListener { - fn BeforeRemoveAttr(&mut self, name: DOMString); -} - impl AttributeHandlers for JS<Element> { fn get_attribute(&self, namespace: Namespace, name: &str) -> Option<JS<Attr>> { if self.get().html_element_in_html_document() { @@ -273,18 +259,18 @@ impl AttributeHandlers for JS<Element> { fn do_set_attribute(&mut self, local_name: DOMString, value: DOMString, name: DOMString, namespace: Namespace, prefix: Option<DOMString>, cb: |&JS<Attr>| -> bool) { + let node: JS<Node> = NodeCast::from(self); let idx = self.get().attrs.iter().position(cb); match idx { Some(idx) => { if namespace == namespace::Null { let old_value = self.get().attrs[idx].get().Value(); - self.before_remove_attr(local_name.clone(), old_value); + vtable_for(&node).before_remove_attr(local_name.clone(), old_value); } self.get_mut().attrs[idx].get_mut().set_value(value.clone()); } None => { - let node: JS<Node> = NodeCast::from(self); let doc = node.get().owner_doc().get(); let new_attr = Attr::new(&doc.window, local_name.clone(), value.clone(), name, namespace.clone(), prefix); @@ -293,7 +279,7 @@ impl AttributeHandlers for JS<Element> { } if namespace == namespace::Null { - self.after_set_attr(local_name, value); + vtable_for(&node).after_set_attr(local_name, value); } } @@ -379,45 +365,6 @@ impl AttributeHandlers for JS<Element> { Ok(()) } - fn after_set_attr(&mut self, local_name: DOMString, value: DOMString) { - let node: JS<Node> = NodeCast::from(self); - match local_name.as_slice() { - "style" => { - let doc = node.get().owner_doc(); - let base_url = doc.get().url().clone(); - self.get_mut().style_attribute = Some(style::parse_style_attribute(value, &base_url)) - } - "id" if node.is_in_doc() => { - // XXX: this dual declaration are workaround to avoid the compile error: - // "borrowed value does not live long enough" - let mut doc = node.get().owner_doc().clone(); - let doc = doc.get_mut(); - doc.register_named_element(self, value.clone()); - } - _ => () - } - - //XXXjdm We really need something like a vtable so we can call AfterSetAttr. - // This hardcoding is awful. - match node.type_id() { - ElementNodeTypeId(HTMLImageElementTypeId) => { - let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(self).unwrap(); - elem.AfterSetAttr(local_name.clone(), value.clone()); - } - ElementNodeTypeId(HTMLIFrameElementTypeId) => { - let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(self).unwrap(); - elem.AfterSetAttr(local_name.clone(), value.clone()); - } - ElementNodeTypeId(HTMLObjectElementTypeId) => { - let mut elem: JS<HTMLObjectElement> = HTMLObjectElementCast::to(self).unwrap(); - elem.AfterSetAttr(local_name.clone(), value.clone()); - } - _ => () - } - - self.notify_attribute_changed(local_name); - } - fn remove_attribute(&mut self, namespace: Namespace, name: DOMString) -> ErrorResult { let (_, local_name) = get_attribute_parts(name.clone()); @@ -433,7 +380,7 @@ impl AttributeHandlers for JS<Element> { Some(idx) => { if namespace == namespace::Null { let removed_raw_value = self.get().attrs[idx].get().Value(); - self.before_remove_attr(local_name, removed_raw_value); + vtable_for(&node).before_remove_attr(local_name.clone(), removed_raw_value); } self.get_mut().attrs.remove(idx); @@ -443,39 +390,6 @@ impl AttributeHandlers for JS<Element> { Ok(()) } - fn before_remove_attr(&mut self, local_name: DOMString, old_value: DOMString) { - let node: JS<Node> = NodeCast::from(self); - match local_name.as_slice() { - "style" => { - self.get_mut().style_attribute = None - } - "id" if node.is_in_doc() => { - // XXX: this dual declaration are workaround to avoid the compile error: - // "borrowed value does not live long enough" - let mut doc = node.get().owner_doc().clone(); - let doc = doc.get_mut(); - doc.unregister_named_element(self, old_value); - } - _ => () - } - - //XXXjdm We really need something like a vtable so we can call BeforeRemoveAttr. - // This hardcoding is awful. - match node.type_id() { - ElementNodeTypeId(HTMLImageElementTypeId) => { - let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(self).unwrap(); - elem.BeforeRemoveAttr(local_name.clone()); - } - ElementNodeTypeId(HTMLIFrameElementTypeId) => { - let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(self).unwrap(); - elem.BeforeRemoveAttr(local_name.clone()); - } - _ => () - } - - self.notify_attribute_changed(local_name); - } - fn notify_attribute_changed(&self, local_name: DOMString) { let node: JS<Node> = NodeCast::from(self); if node.is_in_doc() { @@ -718,13 +632,81 @@ impl Element { } } -pub trait IElement { - fn bind_to_tree_impl(&self); - fn unbind_from_tree_impl(&self); +pub fn get_attribute_parts(name: DOMString) -> (Option<~str>, ~str) { + //FIXME: Throw for XML-invalid names + //FIXME: Throw for XMLNS-invalid names + let (prefix, local_name) = if name.contains(":") { + let parts: ~[&str] = name.splitn(':', 1).collect(); + (Some(parts[0].to_owned()), parts[1].to_owned()) + } else { + (None, name) + }; + + (prefix, local_name) } -impl IElement for JS<Element> { - fn bind_to_tree_impl(&self) { +impl VirtualMethods for JS<Element> { + fn super_type(&self) -> Option<~VirtualMethods:> { + let node: JS<Node> = NodeCast::from(self); + Some(~node as ~VirtualMethods:) + } + + fn after_set_attr(&mut self, name: DOMString, value: DOMString) { + match self.super_type() { + Some(ref mut s) => s.after_set_attr(name.clone(), value.clone()), + _ => (), + } + + let node: JS<Node> = NodeCast::from(self); + match name.as_slice() { + "style" => { + let doc = node.get().owner_doc(); + let base_url = doc.get().url().clone(); + self.get_mut().style_attribute = Some(style::parse_style_attribute(value, &base_url)) + } + "id" if node.is_in_doc() => { + // XXX: this dual declaration are workaround to avoid the compile error: + // "borrowed value does not live long enough" + let mut doc = node.get().owner_doc().clone(); + let doc = doc.get_mut(); + doc.register_named_element(self, value.clone()); + } + _ => () + } + + self.notify_attribute_changed(name); + } + + fn before_remove_attr(&mut self, name: DOMString, value: DOMString) { + match self.super_type() { + Some(ref mut s) => s.before_remove_attr(name.clone(), value.clone()), + _ => (), + } + + let node: JS<Node> = NodeCast::from(self); + match name.as_slice() { + "style" => { + self.get_mut().style_attribute = None + } + "id" if node.is_in_doc() => { + // XXX: this dual declaration are workaround to avoid the compile error: + // "borrowed value does not live long enough" + let mut doc = node.get().owner_doc().clone(); + let doc = doc.get_mut(); + doc.unregister_named_element(self, value); + } + _ => () + } + + self.notify_attribute_changed(name); + } + + fn bind_to_tree(&mut self) { + match self.super_type() { + Some(ref mut s) => s.bind_to_tree(), + _ => (), + } + match self.get_attribute(Null, "id") { Some(attr) => { let mut doc = document_from_node(self); @@ -734,7 +716,12 @@ impl IElement for JS<Element> { } } - fn unbind_from_tree_impl(&self) { + fn unbind_from_tree(&mut self) { + match self.super_type() { + Some(ref mut s) => s.unbind_from_tree(), + _ => (), + } + match self.get_attribute(Null, "id") { Some(attr) => { let mut doc = document_from_node(self); @@ -744,16 +731,3 @@ impl IElement for JS<Element> { } } } - -pub fn get_attribute_parts(name: DOMString) -> (Option<~str>, ~str) { - //FIXME: Throw for XML-invalid names - //FIXME: Throw for XMLNS-invalid names - let (prefix, local_name) = if name.contains(":") { - let parts: ~[&str] = name.splitn(':', 1).collect(); - (Some(parts[0].to_owned()), parts[1].to_owned()) - } else { - (None, name) - }; - - (prefix, local_name) -} |