Clean up the cast calls

This commit is contained in:
Anthony Ramine 2015-10-07 14:55:02 +02:00
parent 13ea3ac413
commit 68014af78e
66 changed files with 412 additions and 718 deletions

View file

@ -454,7 +454,7 @@ impl Runnable for ConnectionEstablishedTask {
let event = Event::new(global.r(), "open".to_owned(),
EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable);
event.fire(ws.upcast::<EventTarget>());
event.fire(ws.upcast());
}
}
@ -496,8 +496,7 @@ impl Runnable for CloseTask {
"error".to_owned(),
EventBubbles::DoesNotBubble,
EventCancelable::Cancelable);
let target = ws.upcast::<EventTarget>();
event.r().fire(target);
event.fire(ws.upcast());
}
let rsn = ws.reason.borrow();
let rsn_clone = rsn.clone();
@ -511,9 +510,7 @@ impl Runnable for CloseTask {
ws.clean_close.get(),
ws.code.get(),
rsn_clone);
let target = ws.upcast::<EventTarget>();
let event = close_event.upcast::<Event>();
event.fire(target);
close_event.upcast::<Event>().fire(ws.upcast());
}
}
@ -562,7 +559,6 @@ impl Runnable for MessageReceivedTask {
},
}
let target = ws.upcast::<EventTarget>();
MessageEvent::dispatch_jsval(target, global.r(), message.handle());
MessageEvent::dispatch_jsval(ws.upcast(), global.r(), message.handle());
}
}