aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/event.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-07-31 11:20:43 -0400
committerGitHub <noreply@github.com>2019-07-31 11:20:43 -0400
commit174bcc443435100da31b20db5ab684f4f3c8255b (patch)
treecb22eaf3b552b3fac4bd06b70e42fbf3d30e369c /components/script/dom/event.rs
parent87e7e3d429f2122ffa9ef016ba5659a3b21be91b (diff)
parentc38c964f1b1d2614f50863be0b896e1700b5fea8 (diff)
downloadservo-174bcc443435100da31b20db5ab684f4f3c8255b.tar.gz
servo-174bcc443435100da31b20db5ab684f4f3c8255b.zip
Auto merge of #23870 - servo:rustup, r=nox
Upgrade to rustc 1.38.0-nightly (dddb7fca0 2019-07-30) <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23870) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/event.rs')
-rw-r--r--components/script/dom/event.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs
index 7c56e672e11..a14beccabe3 100644
--- a/components/script/dom/event.rs
+++ b/components/script/dom/event.rs
@@ -485,7 +485,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, event_path: &[&Eve
// Step 6.
for object in event_path.iter().rev() {
invoke(
- window.deref(),
+ window.as_deref(),
object,
event,
Some(ListenerPhase::Capturing),
@@ -501,7 +501,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, event_path: &[&Eve
event.phase.set(EventPhase::AtTarget);
// Step 8.
- invoke(window.deref(), target, event, None);
+ invoke(window.as_deref(), target, event, None);
if event.stop_propagation.get() {
return;
}
@@ -517,7 +517,12 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, event_path: &[&Eve
// Step 9.2.
for object in event_path {
- invoke(window.deref(), object, event, Some(ListenerPhase::Bubbling));
+ invoke(
+ window.as_deref(),
+ object,
+ event,
+ Some(ListenerPhase::Bubbling),
+ );
if event.stop_propagation.get() {
return;
}