aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/eventdispatcher.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-01-01 12:20:52 +0100
committerMs2ger <ms2ger@gmail.com>2015-01-01 20:36:43 +0100
commit1dad710063e601d3560b0cf89c602d16a0a48657 (patch)
tree400c86753feef6e0949cb2fabd5a1ee84f5812f3 /components/script/dom/eventdispatcher.rs
parentc9f26dfd599bd50deac9e120bd54c9dbdfe40ae0 (diff)
downloadservo-1dad710063e601d3560b0cf89c602d16a0a48657.tar.gz
servo-1dad710063e601d3560b0cf89c602d16a0a48657.zip
Replace Root::deref() calls by Root::r() calls where possible.
This changes those calls that were already sound.
Diffstat (limited to 'components/script/dom/eventdispatcher.rs')
-rw-r--r--components/script/dom/eventdispatcher.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs
index 412b0cdcb4d..d76c3002d8f 100644
--- a/components/script/dom/eventdispatcher.rs
+++ b/components/script/dom/eventdispatcher.rs
@@ -43,12 +43,12 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
/* capturing */
for cur_target in chain.as_slice().iter().rev() {
- let stopped = match cur_target.get_listeners_for(type_.as_slice(), ListenerPhase::Capturing) {
+ let stopped = match cur_target.r().get_listeners_for(type_.as_slice(), ListenerPhase::Capturing) {
Some(listeners) => {
- event.set_current_target(cur_target.deref().clone());
+ event.set_current_target(cur_target.r());
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
- let _ = listener.HandleEvent_(**cur_target, event, ReportExceptions);
+ let _ = listener.HandleEvent_(cur_target.r(), event, ReportExceptions);
if event.stop_immediate() {
break;
@@ -88,12 +88,12 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
event.set_phase(EventPhase::Bubbling);
for cur_target in chain.iter() {
- let stopped = match cur_target.get_listeners_for(type_.as_slice(), ListenerPhase::Bubbling) {
+ let stopped = match cur_target.r().get_listeners_for(type_.as_slice(), ListenerPhase::Bubbling) {
Some(listeners) => {
- event.set_current_target(cur_target.deref().clone());
+ event.set_current_target(cur_target.r());
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
- let _ = listener.HandleEvent_(**cur_target, event, ReportExceptions);
+ let _ = listener.HandleEvent_(cur_target.r(), event, ReportExceptions);
if event.stop_immediate() {
break;
@@ -114,7 +114,7 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
let target = event.GetTarget().root();
match target {
Some(target) => {
- let node: Option<JSRef<Node>> = NodeCast::to_ref(*target);
+ let node: Option<JSRef<Node>> = NodeCast::to_ref(target.r());
match node {
Some(node) => {
let vtable = vtable_for(&node);