diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2017-01-21 01:26:19 +0100 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-01-21 14:32:37 +0100 |
| commit | ee1ff1d385fdf09936f934f23abea2278564d154 (patch) | |
| tree | 77a845c0f912e35e345801d88e39f13521bdfb54 | |
| parent | 707f8f881ebcf1ebf531ea3437d8148e47409092 (diff) | |
| download | servo-ee1ff1d385fdf09936f934f23abea2278564d154.tar.gz servo-ee1ff1d385fdf09936f934f23abea2278564d154.zip | |
Make FocusEvent::new_uninitialized take a &Window
| -rw-r--r-- | components/script/dom/document.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/focusevent.rs | 7 | ||||
| -rw-r--r-- | components/script/dom/webidls/FocusEvent.webidl | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 8702120c92e..6527e98b2e4 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -2612,7 +2612,7 @@ impl DocumentMethods for Document { "events" | "event" | "htmlevents" | "svgevents" => Ok(Event::new_uninitialized(&self.window.upcast())), "focusevent" => - Ok(Root::upcast(FocusEvent::new_uninitialized(self.window.upcast()))), + Ok(Root::upcast(FocusEvent::new_uninitialized(&self.window))), "hashchangeevent" => Ok(Root::upcast(HashChangeEvent::new_uninitialized(&self.window.upcast()))), "keyboardevent" => diff --git a/components/script/dom/focusevent.rs b/components/script/dom/focusevent.rs index c7e48531479..6ffed30e857 100644 --- a/components/script/dom/focusevent.rs +++ b/components/script/dom/focusevent.rs @@ -12,7 +12,6 @@ use dom::bindings::reflector::reflect_dom_object; use dom::bindings::str::DOMString; use dom::event::{EventBubbles, EventCancelable}; use dom::eventtarget::EventTarget; -use dom::globalscope::GlobalScope; use dom::uievent::UIEvent; use dom::window::Window; use std::default::Default; @@ -31,9 +30,9 @@ impl FocusEvent { } } - pub fn new_uninitialized(global: &GlobalScope) -> Root<FocusEvent> { + pub fn new_uninitialized(window: &Window) -> Root<FocusEvent> { reflect_dom_object(box FocusEvent::new_inherited(), - global, + window, FocusEventBinding::Wrap) } @@ -44,7 +43,7 @@ impl FocusEvent { view: Option<&Window>, detail: i32, related_target: Option<&EventTarget>) -> Root<FocusEvent> { - let ev = FocusEvent::new_uninitialized(window.upcast()); + let ev = FocusEvent::new_uninitialized(window); ev.upcast::<UIEvent>().InitUIEvent(type_, bool::from(can_bubble), bool::from(cancelable), diff --git a/components/script/dom/webidls/FocusEvent.webidl b/components/script/dom/webidls/FocusEvent.webidl index 42e560b72b4..14ec3ae67e9 100644 --- a/components/script/dom/webidls/FocusEvent.webidl +++ b/components/script/dom/webidls/FocusEvent.webidl @@ -3,7 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://w3c.github.io/uievents/#interface-FocusEvent -[Constructor(DOMString typeArg, optional FocusEventInit focusEventInitDict)] +[Constructor(DOMString typeArg, optional FocusEventInit focusEventInitDict), + Exposed=Window] interface FocusEvent : UIEvent { readonly attribute EventTarget? relatedTarget; }; |