Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-22 16:18:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1250 : Ms2ger/servo/event-new, r=jdm

Browse source
This commit is contained in:
bors-servo 2013-11-15 07:34:25 -08:00
commit 8880419a76
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/script/dom/document.rs
View file

@ -11,7 +11,7 @@ use dom::bindings::utils::{xml_name_type, InvalidXMLName};
use dom::documentfragment::DocumentFragment; use dom::documentfragment::DocumentFragment;
use dom::element::{Element}; use dom::element::{Element};
use dom::element::{HTMLHeadElementTypeId, HTMLTitleElementTypeId}; use dom::element::{HTMLHeadElementTypeId, HTMLTitleElementTypeId};
use dom::event::{AbstractEvent, Event, HTMLEventTypeId, UIEventTypeId}; use dom::event::{AbstractEvent, Event};
use dom::htmlcollection::HTMLCollection; use dom::htmlcollection::HTMLCollection;
use dom::htmldocument::HTMLDocument; use dom::htmldocument::HTMLDocument;
use dom::mouseevent::MouseEvent; use dom::mouseevent::MouseEvent;
@ -223,9 +223,9 @@ impl Document {
pub fn CreateEvent(&self, interface: DOMString) -> Fallible<AbstractEvent> { pub fn CreateEvent(&self, interface: DOMString) -> Fallible<AbstractEvent> {
match interface.as_slice() { match interface.as_slice() {
"UIEvents" => Ok(UIEvent::new(self.window, UIEventTypeId)), "UIEvents" => Ok(UIEvent::new(self.window)),
"MouseEvents" => Ok(MouseEvent::new(self.window)), "MouseEvents" => Ok(MouseEvent::new(self.window)),
"HTMLEvents" => Ok(Event::new(self.window, HTMLEventTypeId)), "HTMLEvents" => Ok(Event::new(self.window)),
_ => Err(NotSupported) _ => Err(NotSupported)
} }
} }

8
src/components/script/dom/event.rs
View file

@ -171,9 +171,9 @@ impl Event {
} }
} }
pub fn new(window: @mut Window, type_id: EventTypeId) -> AbstractEvent { pub fn new(window: @mut Window) -> AbstractEvent {
let ev = reflect_dom_object(@mut Event::new_inherited(type_id), window, let ev = reflect_dom_object(@mut Event::new_inherited(HTMLEventTypeId),
EventBinding::Wrap); window, EventBinding::Wrap);
Event::as_abstract(ev) Event::as_abstract(ev)
} }
@ -242,7 +242,7 @@ impl Event {
pub fn Constructor(global: @mut Window, pub fn Constructor(global: @mut Window,
type_: DOMString, type_: DOMString,
init: &EventBinding::EventInit) -> Fallible<AbstractEvent> { init: &EventBinding::EventInit) -> Fallible<AbstractEvent> {
let ev = Event::new(global, HTMLEventTypeId); let ev = Event::new(global);
ev.mut_event().InitEvent(type_, init.bubbles, init.cancelable); ev.mut_event().InitEvent(type_, init.bubbles, init.cancelable);
Ok(ev) Ok(ev)
} }

6
src/components/script/dom/uievent.rs
View file

@ -25,8 +25,8 @@ impl UIEvent {
} }
} }
pub fn new(window: @mut Window, type_id: EventTypeId) -> AbstractEvent { pub fn new(window: @mut Window) -> AbstractEvent {
let ev = reflect_dom_object(@mut UIEvent::new_inherited(type_id), let ev = reflect_dom_object(@mut UIEvent::new_inherited(UIEventTypeId),
window, window,
UIEventBinding::Wrap); UIEventBinding::Wrap);
Event::as_abstract(ev) Event::as_abstract(ev)
@ -35,7 +35,7 @@ impl UIEvent {
pub fn Constructor(owner: @mut Window, pub fn Constructor(owner: @mut Window,
type_: DOMString, type_: DOMString,
init: &UIEventBinding::UIEventInit) -> Fallible<AbstractEvent> { init: &UIEventBinding::UIEventInit) -> Fallible<AbstractEvent> {
let ev = UIEvent::new(owner, UIEventTypeId); let ev = UIEvent::new(owner);
ev.mut_uievent().InitUIEvent(type_, init.parent.bubbles, init.parent.cancelable, ev.mut_uievent().InitUIEvent(type_, init.parent.bubbles, init.parent.cancelable,
init.view, init.detail); init.view, init.detail);
Ok(ev) Ok(ev)

4
src/components/script/script_task.rs
View file

@ -12,7 +12,7 @@ use dom::bindings::utils::{Reflectable, GlobalStaticData};
use dom::document::AbstractDocument; use dom::document::AbstractDocument;
use dom::element::Element; use dom::element::Element;
use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, MouseUpEvent}; use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, MouseUpEvent};
use dom::event::{Event, HTMLEventTypeId}; use dom::event::Event;
use dom::eventtarget::AbstractEventTarget; use dom::eventtarget::AbstractEventTarget;
use dom::htmldocument::HTMLDocument; use dom::htmldocument::HTMLDocument;
use dom::window::Window; use dom::window::Window;
@ -771,7 +771,7 @@ impl ScriptTask {
// We have no concept of a document loader right now, so just dispatch the // We have no concept of a document loader right now, so just dispatch the
// "load" event as soon as we've finished executing all scripts parsed during // "load" event as soon as we've finished executing all scripts parsed during
// the initial load. // the initial load.
let event = Event::new(window, HTMLEventTypeId); let event = Event::new(window);
event.mut_event().InitEvent(~"load", false, false); event.mut_event().InitEvent(~"load", false, false);
let doctarget = AbstractEventTarget::from_document(document); let doctarget = AbstractEventTarget::from_document(document);
let wintarget = AbstractEventTarget::from_window(window); let wintarget = AbstractEventTarget::from_window(window);