From ea2560ef20ec1116b0897e84fb58eb14a8ea4696 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 9 Apr 2014 23:55:45 +0200 Subject: Rename before_remove_attr and after_set_attr to allow reusing those names in the next commit. --- src/components/script/dom/element.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/components/script/dom/element.rs') diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 5be2466b80d..f27655165fb 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -202,9 +202,9 @@ pub trait AttributeHandlers { fn SetAttributeNS(&mut self, namespace_url: Option, name: DOMString, value: DOMString) -> ErrorResult; - fn after_set_attr(&mut self, local_name: DOMString, value: DOMString); + 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 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; @@ -278,7 +278,7 @@ impl AttributeHandlers for JS { Some(idx) => { if namespace == namespace::Null { let old_value = self.get().attrs[idx].get().Value(); - self.before_remove_attr(local_name.clone(), old_value); + self.before_remove_attr_(local_name.clone(), old_value); } self.get_mut().attrs[idx].get_mut().set_value(value.clone()); } @@ -293,7 +293,7 @@ impl AttributeHandlers for JS { } if namespace == namespace::Null { - self.after_set_attr(local_name, value); + self.after_set_attr_(local_name, value); } } @@ -379,7 +379,7 @@ impl AttributeHandlers for JS { Ok(()) } - fn after_set_attr(&mut self, local_name: DOMString, value: DOMString) { + fn after_set_attr_(&mut self, local_name: DOMString, value: DOMString) { let node: JS = NodeCast::from(self); match local_name.as_slice() { "style" => { @@ -433,7 +433,7 @@ impl AttributeHandlers for JS { 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); + self.before_remove_attr_(local_name, removed_raw_value); } self.get_mut().attrs.remove(idx); @@ -443,7 +443,7 @@ impl AttributeHandlers for JS { Ok(()) } - fn before_remove_attr(&mut self, local_name: DOMString, old_value: DOMString) { + fn before_remove_attr_(&mut self, local_name: DOMString, old_value: DOMString) { let node: JS = NodeCast::from(self); match local_name.as_slice() { "style" => { -- cgit v1.2.3 From ca6cfb5bca2ffbb41dd7735557f11fb5726be6e4 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 9 Apr 2014 20:02:40 +0200 Subject: Add support for trait-based virtual methods on Nodes, and use it for before_remove_attr and after_set_attr. --- src/components/script/dom/element.rs | 57 ++++++++---------------------------- 1 file changed, 12 insertions(+), 45 deletions(-) (limited to 'src/components/script/dom/element.rs') diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index f27655165fb..f9e3965cd95 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}; @@ -216,14 +212,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 { fn get_attribute(&self, namespace: Namespace, name: &str) -> Option> { if self.get().html_element_in_html_document() { @@ -397,23 +385,7 @@ impl AttributeHandlers for JS { _ => () } - //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 = HTMLImageElementCast::to(self).unwrap(); - elem.AfterSetAttr(local_name.clone(), value.clone()); - } - ElementNodeTypeId(HTMLIFrameElementTypeId) => { - let mut elem: JS = HTMLIFrameElementCast::to(self).unwrap(); - elem.AfterSetAttr(local_name.clone(), value.clone()); - } - ElementNodeTypeId(HTMLObjectElementTypeId) => { - let mut elem: JS = HTMLObjectElementCast::to(self).unwrap(); - elem.AfterSetAttr(local_name.clone(), value.clone()); - } - _ => () - } + vtable_for(&node).after_set_attr(local_name.clone(), value.clone()); self.notify_attribute_changed(local_name); } @@ -454,24 +426,12 @@ impl AttributeHandlers for JS { // "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); + doc.unregister_named_element(self, old_value.clone()); } _ => () } - //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 = HTMLImageElementCast::to(self).unwrap(); - elem.BeforeRemoveAttr(local_name.clone()); - } - ElementNodeTypeId(HTMLIFrameElementTypeId) => { - let mut elem: JS = HTMLIFrameElementCast::to(self).unwrap(); - elem.BeforeRemoveAttr(local_name.clone()); - } - _ => () - } + vtable_for(&node).before_remove_attr(local_name.clone(), old_value); self.notify_attribute_changed(local_name); } @@ -757,3 +717,10 @@ pub fn get_attribute_parts(name: DOMString) -> (Option<~str>, ~str) { (prefix, local_name) } + +impl VirtualMethods for JS { + fn super_type(&self) -> Option<~VirtualMethods:> { + let node: JS = NodeCast::from(self); + Some(~node as ~VirtualMethods:) + } +} -- cgit v1.2.3 From f5d1907195500aa6785b3c6034058e5d2b66dae7 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 10 Apr 2014 09:03:42 +0200 Subject: Integrate Element's after_set/remove behaviour into the virtual method hierarchy. --- src/components/script/dom/element.rs | 104 ++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 50 deletions(-) (limited to 'src/components/script/dom/element.rs') diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index f9e3965cd95..a978ea5d525 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -198,9 +198,7 @@ pub trait AttributeHandlers { fn SetAttributeNS(&mut self, namespace_url: Option, 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; @@ -261,18 +259,18 @@ impl AttributeHandlers for JS { fn do_set_attribute(&mut self, local_name: DOMString, value: DOMString, name: DOMString, namespace: Namespace, prefix: Option, cb: |&JS| -> bool) { + let node: JS = 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 = 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); @@ -281,7 +279,7 @@ impl AttributeHandlers for JS { } if namespace == namespace::Null { - self.after_set_attr_(local_name, value); + vtable_for(&node).after_set_attr(local_name, value); } } @@ -367,29 +365,6 @@ impl AttributeHandlers for JS { Ok(()) } - fn after_set_attr_(&mut self, local_name: DOMString, value: DOMString) { - let node: JS = 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()); - } - _ => () - } - - vtable_for(&node).after_set_attr(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()); @@ -405,7 +380,7 @@ impl AttributeHandlers for JS { 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); @@ -415,27 +390,6 @@ impl AttributeHandlers for JS { Ok(()) } - fn before_remove_attr_(&mut self, local_name: DOMString, old_value: DOMString) { - let node: JS = 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.clone()); - } - _ => () - } - - vtable_for(&node).before_remove_attr(local_name.clone(), old_value); - - self.notify_attribute_changed(local_name); - } - fn notify_attribute_changed(&self, local_name: DOMString) { let node: JS = NodeCast::from(self); if node.is_in_doc() { @@ -723,4 +677,54 @@ impl VirtualMethods for JS { let node: JS = 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 = 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 = 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); + } } -- cgit v1.2.3 From 6388dec9966679202904f2f59d8efe8df7edb9c8 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 13 Feb 2014 08:50:28 +0530 Subject: Add overridable tree binding/unbinding behaviour. --- src/components/script/dom/element.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/components/script/dom/element.rs') diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index a978ea5d525..d1b19f41ebe 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -727,4 +727,22 @@ impl VirtualMethods for JS { self.notify_attribute_changed(name); } + + fn bind_to_tree(&mut self) { + match self.super_type() { + Some(ref mut s) => s.bind_to_tree(), + _ => (), + } + + self.bind_to_tree_impl(); + } + + fn unbind_from_tree(&mut self) { + match self.super_type() { + Some(ref mut s) => s.unbind_from_tree(), + _ => (), + } + + self.unbind_from_tree_impl(); + } } -- cgit v1.2.3 From a3d13c35a2a46fa7a30e705182980fe06aa04e3c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Apr 2014 09:56:46 +0200 Subject: Remove the IElement trait. --- src/components/script/dom/element.rs | 43 ++++++++++++------------------------ 1 file changed, 14 insertions(+), 29 deletions(-) (limited to 'src/components/script/dom/element.rs') diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index d1b19f41ebe..b06e3253989 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -632,33 +632,6 @@ impl Element { } } -pub trait IElement { - fn bind_to_tree_impl(&self); - fn unbind_from_tree_impl(&self); -} - -impl IElement for JS { - fn bind_to_tree_impl(&self) { - match self.get_attribute(Null, "id") { - Some(attr) => { - let mut doc = document_from_node(self); - doc.get_mut().register_named_element(self, attr.get().Value()); - } - _ => () - } - } - - fn unbind_from_tree_impl(&self) { - match self.get_attribute(Null, "id") { - Some(attr) => { - let mut doc = document_from_node(self); - doc.get_mut().unregister_named_element(self, attr.get().Value()); - } - _ => () - } - } -} - pub fn get_attribute_parts(name: DOMString) -> (Option<~str>, ~str) { //FIXME: Throw for XML-invalid names //FIXME: Throw for XMLNS-invalid names @@ -734,7 +707,13 @@ impl VirtualMethods for JS { _ => (), } - self.bind_to_tree_impl(); + match self.get_attribute(Null, "id") { + Some(attr) => { + let mut doc = document_from_node(self); + doc.get_mut().register_named_element(self, attr.get().Value()); + } + _ => () + } } fn unbind_from_tree(&mut self) { @@ -743,6 +722,12 @@ impl VirtualMethods for JS { _ => (), } - self.unbind_from_tree_impl(); + match self.get_attribute(Null, "id") { + Some(attr) => { + let mut doc = document_from_node(self); + doc.get_mut().unregister_named_element(self, attr.get().Value()); + } + _ => () + } } } -- cgit v1.2.3