aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/script/dom/document.rs4
-rw-r--r--src/components/script/dom/mouseevent.rs40
-rw-r--r--src/components/script/dom/uievent.rs21
-rw-r--r--src/components/script/script_task.rs7
4 files changed, 53 insertions, 19 deletions
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index c10c791d828..3005d23c5f9 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -532,8 +532,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
match interface.to_ascii_lower().as_slice() {
// FIXME: Implement CustomEvent (http://dom.spec.whatwg.org/#customevent)
- "uievents" | "uievent" => Ok(EventCast::from_temporary(UIEvent::new(&*window))),
- "mouseevents" | "mouseevent" => Ok(EventCast::from_temporary(MouseEvent::new(&*window))),
+ "uievents" | "uievent" => Ok(EventCast::from_temporary(UIEvent::new_uninitialized(&*window))),
+ "mouseevents" | "mouseevent" => Ok(EventCast::from_temporary(MouseEvent::new_uninitialized(&*window))),
"htmlevents" | "events" | "event" => Ok(Event::new(&*window)),
_ => Err(NotSupported)
}
diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs
index fbd0abfc4d4..32c7704b291 100644
--- a/src/components/script/dom/mouseevent.rs
+++ b/src/components/script/dom/mouseevent.rs
@@ -51,22 +51,46 @@ impl MouseEvent {
}
}
- pub fn new(window: &JSRef<Window>) -> Temporary<MouseEvent> {
+ pub fn new_uninitialized(window: &JSRef<Window>) -> Temporary<MouseEvent> {
reflect_dom_object(~MouseEvent::new_inherited(),
window,
MouseEventBinding::Wrap)
}
+ pub fn new(window: &JSRef<Window>,
+ type_: DOMString,
+ canBubble: bool,
+ cancelable: bool,
+ view: Option<JSRef<Window>>,
+ detail: i32,
+ screenX: i32,
+ screenY: i32,
+ clientX: i32,
+ clientY: i32,
+ ctrlKey: bool,
+ altKey: bool,
+ shiftKey: bool,
+ metaKey: bool,
+ button: u16,
+ relatedTarget: Option<JSRef<EventTarget>>) -> Temporary<MouseEvent> {
+ let mut ev = MouseEvent::new_uninitialized(window).root();
+ ev.InitMouseEvent(type_, canBubble, cancelable, view, detail,
+ screenX, screenY, clientX, clientY,
+ ctrlKey, altKey, shiftKey, metaKey,
+ button, relatedTarget);
+ Temporary::from_rooted(&*ev)
+ }
+
pub fn Constructor(owner: &JSRef<Window>,
type_: DOMString,
init: &MouseEventBinding::MouseEventInit) -> Fallible<Temporary<MouseEvent>> {
- let mut ev = MouseEvent::new(owner).root();
- ev.InitMouseEvent(type_, init.bubbles, init.cancelable, init.view.root_ref(),
- init.detail, init.screenX, init.screenY,
- init.clientX, init.clientY, init.ctrlKey,
- init.altKey, init.shiftKey, init.metaKey,
- init.button, init.relatedTarget.root_ref());
- Ok(Temporary::from_rooted(&*ev))
+ let event = MouseEvent::new(owner, type_, init.bubbles, init.cancelable,
+ init.view.root_ref(),
+ init.detail, init.screenX, init.screenY,
+ init.clientX, init.clientY, init.ctrlKey,
+ init.altKey, init.shiftKey, init.metaKey,
+ init.button, init.relatedTarget.root_ref());
+ Ok(event)
}
}
diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs
index 631353fe498..d37ef605512 100644
--- a/src/components/script/dom/uievent.rs
+++ b/src/components/script/dom/uievent.rs
@@ -36,19 +36,30 @@ impl UIEvent {
}
}
- pub fn new(window: &JSRef<Window>) -> Temporary<UIEvent> {
+ pub fn new_uninitialized(window: &JSRef<Window>) -> Temporary<UIEvent> {
reflect_dom_object(~UIEvent::new_inherited(UIEventTypeId),
window,
UIEventBinding::Wrap)
}
+ pub fn new(window: &JSRef<Window>,
+ type_: DOMString,
+ can_bubble: bool,
+ cancelable: bool,
+ view: Option<JSRef<Window>>,
+ detail: i32) -> Temporary<UIEvent> {
+ let mut ev = UIEvent::new_uninitialized(window).root();
+ ev.InitUIEvent(type_, can_bubble, cancelable, view, detail);
+ Temporary::from_rooted(&*ev)
+ }
+
pub fn Constructor(owner: &JSRef<Window>,
type_: DOMString,
init: &UIEventBinding::UIEventInit) -> Fallible<Temporary<UIEvent>> {
- let mut ev = UIEvent::new(owner).root();
- ev.InitUIEvent(type_, init.parent.bubbles, init.parent.cancelable,
- init.view.root_ref(), init.detail);
- Ok(Temporary::from_rooted(&*ev))
+ let event = UIEvent::new(owner, type_,
+ init.parent.bubbles, init.parent.cancelable,
+ init.view.root_ref(), init.detail);
+ Ok(event)
}
}
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 66ab9ab9a56..3786091e7d7 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -16,7 +16,7 @@ use dom::document::{Document, HTMLDocument, DocumentMethods, DocumentHelpers};
use dom::element::{Element, AttributeHandlers};
use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, MouseMoveEvent, MouseUpEvent};
use dom::event::{Event, EventMethods};
-use dom::uievent::{UIEvent, UIEventMethods};
+use dom::uievent::UIEvent;
use dom::eventtarget::{EventTarget, EventTargetHelpers};
use dom::node;
use dom::node::{Node, NodeHelpers};
@@ -1088,9 +1088,8 @@ impl ScriptTask {
Some(mut window) => {
// http://dev.w3.org/csswg/cssom-view/#resizing-viewports
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#event-type-resize
- let mut uievent = UIEvent::new(&*window).root();
- uievent.InitUIEvent("resize".to_owned(), false, false,
- Some((*window).clone()), 0i32);
+ let mut uievent = UIEvent::new(&window.clone(), "resize".to_owned(), false, false,
+ Some((*window).clone()), 0i32).root();
let event: &mut JSRef<Event> = EventCast::from_mut_ref(&mut *uievent);
let wintarget: &mut JSRef<EventTarget> = EventTargetCast::from_mut_ref(&mut *window);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 20:19:56 +0000