Rename Runnable to Task

The changes are:
 * `*Runnable` -> `*Task`;
 * `RunnableMsg` -> `Task`;
 * `RunnableWrapper` -> `TaskCanceller`;
 * `MainThreadRunnable` -> `MainThreadTask`;
 * `wrap_runnable` -> `wrap_task`;
 * `get_runnable_wrapper` -> `task_canceller`;
 * `handler` -> `run`;
 * `main_thread_handler` -> `run_with_script_thread`.
This commit is contained in:
Anthony Ramine 2017-09-16 02:09:26 +02:00
parent 52a6f63608
commit 56117d3185
38 changed files with 370 additions and 332 deletions

View file

@ -35,7 +35,7 @@ use ipc_channel::router::ROUTER;
use js::conversions::ConversionResult;
use js::jsapi::{JSAutoCompartment, JSContext, JSObject};
use js::jsval::{ObjectValue, UndefinedValue};
use script_thread::Runnable;
use script_thread::Task;
use std::cell::Ref;
use std::collections::HashMap;
use std::rc::Rc;
@ -224,25 +224,28 @@ pub fn response_async<T: AsyncBluetoothListener + DomObject + 'static>(
receiver: Trusted::new(receiver),
}));
ROUTER.add_route(action_receiver.to_opaque(), box move |message| {
struct ListenerRunnable<T: AsyncBluetoothListener + DomObject> {
struct ListenerTask<T: AsyncBluetoothListener + DomObject> {
context: Arc<Mutex<BluetoothContext<T>>>,
action: BluetoothResponseResult,
}
impl<T: AsyncBluetoothListener + DomObject> Runnable for ListenerRunnable<T> {
fn handler(self: Box<Self>) {
impl<T> Task for ListenerTask<T>
where
T: AsyncBluetoothListener + DomObject,
{
fn run(self: Box<Self>) {
let this = *self;
let mut context = this.context.lock().unwrap();
context.response(this.action);
}
}
let runnable = box ListenerRunnable {
let task = box ListenerTask {
context: context.clone(),
action: message.to().unwrap(),
};
let result = task_source.queue_wrapperless(runnable);
let result = task_source.queue_unconditionally(task);
if let Err(err) = result {
warn!("failed to deliver network data: {:?}", err);
}