aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/eventdispatcher.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-07-25 11:39:20 -0600
committerbors-servo <metajack+bors@gmail.com>2015-07-25 11:39:20 -0600
commit705c95dedbbaa60ffd08e70579915e228d5b6ee0 (patch)
tree4cbafee85f191cfbd96986b4d520610adb27a26c /components/script/dom/eventdispatcher.rs
parent8edf1a5ecdecc9f6de8210fc875cff3679fda09e (diff)
parent7b40cc9fd7ea4dcc3816be0cb1ad6543bb5c88e0 (diff)
downloadservo-705c95dedbbaa60ffd08e70579915e228d5b6ee0.tar.gz
servo-705c95dedbbaa60ffd08e70579915e228d5b6ee0.zip
Auto merge of #6660 - nox:children-changed, r=jdm
Introduce VirtualMethods::children_changed() This virtual method mimics the behaviour of mutation observers and make it more viable than the older child_inserted(), which didn't cover removed nodes and was called as many times as there were inserted nodes. A few other shortcomings where remove_child() was called directly instead of Node::remove() were also fixed while at it. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6660) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/eventdispatcher.rs')
-rw-r--r--components/script/dom/eventdispatcher.rs18
1 files changed, 8 insertions, 10 deletions
diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs
index 8633f63df7c..0c6c7e14b18 100644
--- a/components/script/dom/eventdispatcher.rs
+++ b/components/script/dom/eventdispatcher.rs
@@ -41,14 +41,13 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget,
//FIXME: The "callback this value" should be currentTarget
/* capturing */
- for cur_target in chain.iter().rev() {
- let cur_target = cur_target.root();
- let stopped = match cur_target.r().get_listeners_for(&type_, ListenerPhase::Capturing) {
+ for cur_target in chain.r().iter().rev() {
+ let stopped = match cur_target.get_listeners_for(&type_, ListenerPhase::Capturing) {
Some(listeners) => {
- event.set_current_target(cur_target.r());
+ event.set_current_target(cur_target);
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
- let _ = listener.HandleEvent_(cur_target.r(), event, Report);
+ let _ = listener.HandleEvent_(*cur_target, event, Report);
if event.stop_immediate() {
break;
@@ -87,14 +86,13 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget,
if event.bubbles() && !event.stop_propagation() {
event.set_phase(EventPhase::Bubbling);
- for cur_target in chain.iter() {
- let cur_target = cur_target.root();
- let stopped = match cur_target.r().get_listeners_for(&type_, ListenerPhase::Bubbling) {
+ for cur_target in chain.r() {
+ let stopped = match cur_target.get_listeners_for(&type_, ListenerPhase::Bubbling) {
Some(listeners) => {
- event.set_current_target(cur_target.r());
+ event.set_current_target(cur_target);
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
- let _ = listener.HandleEvent_(cur_target.r(), event, Report);
+ let _ = listener.HandleEvent_(*cur_target, event, Report);
if event.stop_immediate() {
break;