Auto merge of #7241 - Wafflespeanut:event_handler, r=Ms2ger

Matching over event listeners and handlers; r=Ms2ger

... for #7065

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7241)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-18 06:49:26 -06:00
commit ff6a70fad3
4 changed files with 30 additions and 40 deletions

View file

@ -47,7 +47,7 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget,
event.set_current_target(cur_target);
for listener in &listeners {
// Explicitly drop any exception on the floor.
let _ = listener.HandleEvent_(*cur_target, event, Report);
listener.call_or_handle_event(*cur_target, event, Report);
if event.stop_immediate() {
break;
@ -73,7 +73,7 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget,
for listeners in opt_listeners {
for listener in listeners {
// Explicitly drop any exception on the floor.
let _ = listener.HandleEvent_(target, event, Report);
listener.call_or_handle_event(target, event, Report);
if event.stop_immediate() {
break;
@ -92,7 +92,7 @@ pub fn dispatch_event<'a, 'b>(target: &'a EventTarget,
event.set_current_target(cur_target);
for listener in &listeners {
// Explicitly drop any exception on the floor.
let _ = listener.HandleEvent_(*cur_target, event, Report);
listener.call_or_handle_event(*cur_target, event, Report);
if event.stop_immediate() {
break;