diff options
author | Ms2ger <ms2ger@gmail.com> | 2014-07-15 22:28:43 +0200 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2014-07-15 22:28:43 +0200 |
commit | d97ec6995773ee79fbde053520bc580e7b33d15d (patch) | |
tree | e5a00cefa1309b80bc8a44287c3cc9059ed4a257 /src/components/script/dom/event.rs | |
parent | f816a92c72e2eb60f733b2cd7072c8542710d5ae (diff) | |
parent | df9d063b36aca184a336b9e67da3ce30bb46cb79 (diff) | |
download | servo-d97ec6995773ee79fbde053520bc580e7b33d15d.tar.gz servo-d97ec6995773ee79fbde053520bc580e7b33d15d.zip |
Merge pull request #2839 from Ms2ger/globals
Introduce abstractions for global scopes; r=Manishearth,larsberg
Diffstat (limited to 'src/components/script/dom/event.rs')
-rw-r--r-- | src/components/script/dom/event.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 0639da59c3a..e68f04f2821 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -5,11 +5,11 @@ use dom::bindings::codegen::Bindings::EventBinding; use dom::bindings::codegen::Bindings::EventBinding::EventConstants; use dom::bindings::error::Fallible; +use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, JSRef, Temporary}; use dom::bindings::trace::Traceable; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::eventtarget::EventTarget; -use dom::window::Window; use servo_msg::constellation_msg::WindowSizeData; use servo_util::str::DOMString; use std::cell::{Cell, RefCell}; @@ -85,22 +85,22 @@ impl Event { } } - pub fn new_uninitialized(window: &JSRef<Window>) -> Temporary<Event> { + pub fn new_uninitialized(global: &GlobalRef) -> Temporary<Event> { reflect_dom_object(box Event::new_inherited(HTMLEventTypeId), - window, + global, EventBinding::Wrap) } - pub fn new(window: &JSRef<Window>, + pub fn new(global: &GlobalRef, type_: DOMString, can_bubble: bool, cancelable: bool) -> Temporary<Event> { - let event = Event::new_uninitialized(window).root(); + let event = Event::new_uninitialized(global).root(); event.deref().InitEvent(type_, can_bubble, cancelable); Temporary::from_rooted(&*event) } - pub fn Constructor(global: &JSRef<Window>, + pub fn Constructor(global: &GlobalRef, type_: DOMString, init: &EventBinding::EventInit) -> Fallible<Temporary<Event>> { Ok(Event::new(global, type_, init.bubbles, init.cancelable)) |