Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Introduce GlobalScope::enqueue_promise_job

Browse source
This commit is contained in:
Anthony Ramine 2016-10-04 16:19:05 +02:00
parent 2ee073053a
commit 4d9347d5b3
4 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/bindings/global.rs
View file

@ -18,7 +18,7 @@ use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL};
use js::glue::{IsWrapper, UnwrapObject};
use js::jsapi::{CurrentGlobalOrNull, GetGlobalForObjectCrossCompartment};
use js::jsapi::{JSContext, JSObject, JS_GetClass};
use script_runtime::{CommonScriptMsg, EnqueuedPromiseCallback, ScriptChan, ScriptPort};
use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort};
use script_thread::ScriptThread;
use task_source::file_reading::FileReadingTaskSource;
@ -84,14 +84,6 @@ impl<'a> GlobalRef<'a> {
GlobalRef::Worker(ref worker) => worker.process_event(msg),
}
}
/// Enqueue a promise callback for subsequent execution.
pub fn enqueue_promise_job(&self, job: EnqueuedPromiseCallback) {
match *self {
GlobalRef::Window(_) => ScriptThread::enqueue_promise_job(job, *self),
GlobalRef::Worker(ref worker) => worker.enqueue_promise_job(job),
}
}
}
impl<'a> Reflectable for GlobalRef<'a> {

13
components/script/dom/globalscope.rs
View file

@ -26,7 +26,7 @@ use libc;
use msg::constellation_msg::PipelineId;
use net_traits::{CoreResourceThread, ResourceThreads, IpcSend};
use profile_traits::{mem, time};
use script_runtime::{ScriptChan, maybe_take_panic_result};
use script_runtime::{EnqueuedPromiseCallback, ScriptChan, maybe_take_panic_result};
use script_thread::{MainThreadScriptChan, RunnableWrapper, ScriptThread};
use script_traits::{MsDuration, ScriptMsg as ConstellationMsg, TimerEvent};
use script_traits::{TimerEventId, TimerEventRequest, TimerSource};
@ -420,6 +420,17 @@ impl GlobalScope {
}
unreachable!();
}
/// Enqueue a promise callback for subsequent execution.
pub fn enqueue_promise_job(&self, job: EnqueuedPromiseCallback) {
if self.is::<Window>() {
return ScriptThread::enqueue_promise_job(job, self);
}
if let Some(worker) = self.downcast::<WorkerGlobalScope>() {
return worker.enqueue_promise_job(job);
}
unreachable!();
}
}
fn timestamp_in_ms(time: Timespec) -> u64 {