aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/dom/transitionevent.rs8
-rw-r--r--components/script/script_thread.rs2
2 files changed, 4 insertions, 6 deletions
diff --git a/components/script/dom/transitionevent.rs b/components/script/dom/transitionevent.rs
index cc17e77eae1..384b40058ce 100644
--- a/components/script/dom/transitionevent.rs
+++ b/components/script/dom/transitionevent.rs
@@ -12,7 +12,6 @@ use dom::bindings::num::Finite;
use dom::bindings::reflector::reflect_dom_object;
use dom::bindings::str::DOMString;
use dom::event::Event;
-use dom::globalscope::GlobalScope;
use dom::window::Window;
use servo_atoms::Atom;
@@ -34,11 +33,11 @@ impl TransitionEvent {
}
}
- pub fn new(global: &GlobalScope,
+ pub fn new(window: &Window,
type_: Atom,
init: &TransitionEventInit) -> Root<TransitionEvent> {
let ev = reflect_dom_object(box TransitionEvent::new_inherited(init),
- global,
+ window,
TransitionEventBinding::Wrap);
{
let event = ev.upcast::<Event>();
@@ -50,8 +49,7 @@ impl TransitionEvent {
pub fn Constructor(window: &Window,
type_: DOMString,
init: &TransitionEventInit) -> Fallible<Root<TransitionEvent>> {
- let global = window.upcast::<GlobalScope>();
- Ok(TransitionEvent::new(global, Atom::from(type_), init))
+ Ok(TransitionEvent::new(window, Atom::from(type_), init))
}
}
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index ce02d763699..57cdd7044c4 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1624,7 +1624,7 @@ impl ScriptThread {
// FIXME: Handle pseudo-elements properly
pseudoElement: DOMString::new()
};
- let transition_event = TransitionEvent::new(window.upcast(),
+ let transition_event = TransitionEvent::new(&window,
atom!("transitionend"),
&init);
transition_event.upcast::<Event>().fire(node.upcast());