mirror of
https://github.com/servo/servo.git
synced 2025-06-24 09:04:33 +01:00
auto merge of #1213 : jdm/servo/loadevent, r=kmcallister
It's good enough for now, since we don't track document resources at all. Should be good enough for #841.
This commit is contained in:
commit
da4ca51049
4 changed files with 54 additions and 3 deletions
|
@ -9,12 +9,14 @@ use dom::node::AbstractNode;
|
|||
use servo_util::tree::{TreeNodeRef};
|
||||
|
||||
// See http://dom.spec.whatwg.org/#concept-event-dispatch for the full dispatch algorithm
|
||||
pub fn dispatch_event(target: AbstractEventTarget, event: AbstractEvent) -> bool {
|
||||
pub fn dispatch_event(target: AbstractEventTarget,
|
||||
pseudo_target: Option<AbstractEventTarget>,
|
||||
event: AbstractEvent) -> bool {
|
||||
assert!(!event.event().dispatching);
|
||||
|
||||
{
|
||||
let event = event.mut_event();
|
||||
event.target = Some(target);
|
||||
event.target = Some(pseudo_target.unwrap_or(target));
|
||||
event.dispatching = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -5,9 +5,11 @@
|
|||
use dom::bindings::utils::{Reflectable, Reflector, DOMString, Fallible};
|
||||
use dom::bindings::utils::{null_str_as_word_null, InvalidState};
|
||||
use dom::bindings::codegen::EventListenerBinding::EventListener;
|
||||
use dom::document::AbstractDocument;
|
||||
use dom::event::AbstractEvent;
|
||||
use dom::eventdispatcher::dispatch_event;
|
||||
use dom::node::{AbstractNode, ScriptView};
|
||||
use dom::window::Window;
|
||||
|
||||
use std::cast;
|
||||
use std::hashmap::HashMap;
|
||||
|
@ -54,6 +56,18 @@ impl AbstractEventTarget {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn from_window(window: @mut Window) -> AbstractEventTarget {
|
||||
AbstractEventTarget {
|
||||
eventtarget: unsafe { cast::transmute(window) }
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_document(document: AbstractDocument) -> AbstractEventTarget {
|
||||
unsafe {
|
||||
cast::transmute(document)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn type_id(&self) -> EventTargetTypeId {
|
||||
self.eventtarget().type_id
|
||||
}
|
||||
|
@ -164,10 +178,17 @@ impl EventTarget {
|
|||
}
|
||||
|
||||
pub fn DispatchEvent(&self, abstract_self: AbstractEventTarget, event: AbstractEvent) -> Fallible<bool> {
|
||||
self.dispatch_event_with_target(abstract_self, None, event)
|
||||
}
|
||||
|
||||
pub fn dispatch_event_with_target(&self,
|
||||
abstract_self: AbstractEventTarget,
|
||||
abstract_target: Option<AbstractEventTarget>,
|
||||
event: AbstractEvent) -> Fallible<bool> {
|
||||
if event.event().dispatching || !event.event().initialized {
|
||||
return Err(InvalidState);
|
||||
}
|
||||
Ok(dispatch_event(abstract_self, event))
|
||||
Ok(dispatch_event(abstract_self, abstract_target, event))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue