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

Introduce dom::htmlscriptelement::EventDispatcher.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2015-02-23 05:35:26 +09:00
parent 287f390c4a
commit 36722182c0
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/script/dom/htmlscriptelement.rs
View file

@ -40,8 +40,6 @@ use url::UrlParser;
pub struct HTMLScriptElement { pub struct HTMLScriptElement {
htmlelement: HTMLElement, htmlelement: HTMLElement,
error_occurred: Cell<bool>,
/// https://html.spec.whatwg.org/multipage/scripting.html#already-started /// https://html.spec.whatwg.org/multipage/scripting.html#already-started
already_started: Cell<bool>, already_started: Cell<bool>,
@ -70,7 +68,6 @@ impl HTMLScriptElement {
creator: ElementCreator) -> HTMLScriptElement { creator: ElementCreator) -> HTMLScriptElement {
HTMLScriptElement { HTMLScriptElement {
htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLScriptElement, localName, prefix, document), htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLScriptElement, localName, prefix, document),
error_occurred: Cell::new(false),
already_started: Cell::new(false), already_started: Cell::new(false),
parser_inserted: Cell::new(creator == ElementCreator::ParserCreated), parser_inserted: Cell::new(creator == ElementCreator::ParserCreated),
non_blocking: Cell::new(creator != ElementCreator::ParserCreated), non_blocking: Cell::new(creator != ElementCreator::ParserCreated),
@ -257,18 +254,25 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
ScriptOrigin::Internal => { ScriptOrigin::Internal => {
let chan = window.script_chan(); let chan = window.script_chan();
let handler = Trusted::new(window.get_cx(), self, chan.clone()); let handler = Trusted::new(window.get_cx(), self, chan.clone());
chan.send(ScriptMsg::RunnableMsg(box handler)).unwrap(); let dispatcher = Box::new(EventDispatcher {
element: handler,
is_error: false,
});
chan.send(ScriptMsg::RunnableMsg(dispatcher)).unwrap();
} }
} }
} }
fn queue_error_event(self) { fn queue_error_event(self) {
self.error_occurred.set(true);
let window = window_from_node(self).root(); let window = window_from_node(self).root();
let window = window.r(); let window = window.r();
let chan = window.script_chan(); let chan = window.script_chan();
let handler = Trusted::new(window.get_cx(), self, chan.clone()); let handler = Trusted::new(window.get_cx(), self, chan.clone());
chan.send(ScriptMsg::RunnableMsg(box handler)).unwrap(); let dispatcher = Box::new(EventDispatcher {
element: handler,
is_error: true,
});
chan.send(ScriptMsg::RunnableMsg(dispatcher)).unwrap();
} }
fn dispatch_load_event(self) { fn dispatch_load_event(self) {
@ -404,10 +408,15 @@ impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> {
} }
} }
impl Runnable for Trusted<HTMLScriptElement> { struct EventDispatcher {
fn handler(self: Box<Trusted<HTMLScriptElement>>) { element: Trusted<HTMLScriptElement>,
let target = self.to_temporary().root(); is_error: bool,
if target.r().error_occurred.get() { }
impl Runnable for EventDispatcher {
fn handler(self: Box<EventDispatcher>) {
let target = self.element.to_temporary().root();
if self.is_error {
target.r().dispatch_error_event(); target.r().dispatch_error_event();
} else { } else {
target.r().dispatch_load_event(); target.r().dispatch_load_event();