diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-07 07:52:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 07:52:09 -0500 |
| commit | a6e4b5bb86ad707a0863acff87344ca4239cfd2c (patch) | |
| tree | c820d9f2420c44cdfe29de97f1a710e7dc354bb7 /components/script/dom/eventdispatcher.rs | |
| parent | e23959a7618e8e7b7ca20300a2afeb1ac77712f3 (diff) | |
| parent | d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4 (diff) | |
| download | servo-a6e4b5bb86ad707a0863acff87344ca4239cfd2c.tar.gz servo-a6e4b5bb86ad707a0863acff87344ca4239cfd2c.zip | |
Auto merge of #13596 - nox:inline, r=Ms2ger
Get rid of dom::bindings::global
Globals in that PR are now represented by the fake IDL interface `GlobalScope`.
<!-- 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/13596)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/eventdispatcher.rs')
| -rw-r--r-- | components/script/dom/eventdispatcher.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs index 28ea0b42b31..cb7107e92e5 100644 --- a/components/script/dom/eventdispatcher.rs +++ b/components/script/dom/eventdispatcher.rs @@ -5,7 +5,6 @@ use devtools_traits::{StartedTimelineMarker, TimelineMarker, TimelineMarkerType}; use dom::bindings::callback::ExceptionHandling::Report; use dom::bindings::codegen::Bindings::EventBinding::EventMethods; -use dom::bindings::global::GlobalRoot; use dom::bindings::inheritance::Castable; use dom::bindings::js::{JS, Root, RootedReference}; use dom::bindings::reflector::Reflectable; @@ -52,8 +51,8 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, event_path: &[&Eve assert!(!event.stop_propagation()); assert!(!event.stop_immediate()); - let window = match target.global() { - GlobalRoot::Window(window) => { + let window = match Root::downcast::<Window>(target.global()) { + Some(window) => { if window.need_emit_timeline_marker(TimelineMarkerType::DOMEvent) { Some(window) } else { |