Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename Task to TaskBox

Browse source
This commit is contained in:
Anthony Ramine 2017-09-20 09:59:52 +02:00
parent f088b708c9
commit 52527d6f9d
19 changed files with 71 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/task_source/dom_manipulation.rs
View file

@ -13,7 +13,7 @@ use servo_atoms::Atom;
use std::fmt;
use std::result::Result;
use std::sync::mpsc::Sender;
use task::{Task, TaskCanceller};
use task::{TaskBox, TaskCanceller};
use task_source::TaskSource;
#[derive(Clone, JSTraceable)]
@ -32,7 +32,7 @@ impl TaskSource for DOMManipulationTaskSource {
canceller: &TaskCanceller,
) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
ScriptThreadEventCategory::ScriptEvent,

8
components/script/task_source/file_reading.rs
View file

@ -6,7 +6,7 @@ use dom::domexception::DOMErrorName;
use dom::filereader::{FileReader, TrustedFileReader, GenerationId, ReadMetaData};
use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan};
use std::sync::Arc;
use task::{Task, TaskCanceller};
use task::{TaskBox, TaskCanceller};
use task_source::TaskSource;
#[derive(JSTraceable)]
@ -25,7 +25,7 @@ impl TaskSource for FileReadingTaskSource {
canceller: &TaskCanceller,
) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
self.0.send(CommonScriptMsg::Task(
ScriptThreadEventCategory::FileRead,
@ -34,8 +34,8 @@ impl TaskSource for FileReadingTaskSource {
}
}
impl Task for FileReadingTask {
fn run(self: Box<Self>) {
impl TaskBox for FileReadingTask {
fn run_box(self: Box<Self>) {
self.handle_task();
}
}

6
components/script/task_source/mod.rs
View file

@ -11,7 +11,7 @@ pub mod user_interaction;
use dom::globalscope::GlobalScope;
use std::result::Result;
use task::{Task, TaskCanceller};
use task::{TaskBox, TaskCanceller};
pub trait TaskSource {
fn queue_with_canceller<T>(
@ -20,11 +20,11 @@ pub trait TaskSource {
canceller: &TaskCanceller,
) -> Result<(), ()>
where
T: Task + 'static;
T: TaskBox + 'static;
fn queue<T>(&self, msg: Box<T>, global: &GlobalScope) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
self.queue_with_canceller(msg, &global.task_canceller())
}

6
components/script/task_source/networking.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
use task::{Task, TaskCanceller};
use task::{TaskBox, TaskCanceller};
use task_source::TaskSource;
#[derive(JSTraceable)]
@ -22,7 +22,7 @@ impl TaskSource for NetworkingTaskSource {
canceller: &TaskCanceller,
) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
self.0.send(CommonScriptMsg::Task(
ScriptThreadEventCategory::NetworkEvent,
@ -36,7 +36,7 @@ impl NetworkingTaskSource {
/// global scope gets destroyed.
pub fn queue_unconditionally<T>(&self, msg: Box<T>) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
self.0.send(CommonScriptMsg::Task(ScriptThreadEventCategory::NetworkEvent, msg))
}

4
components/script/task_source/performance_timeline.rs
View file

@ -11,7 +11,7 @@ use dom::globalscope::GlobalScope;
use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
use std::fmt;
use std::result::Result;
use task::{Task, TaskCanceller};
use task::{TaskBox, TaskCanceller};
use task_source::TaskSource;
#[derive(JSTraceable)]
@ -36,7 +36,7 @@ impl TaskSource for PerformanceTimelineTaskSource {
canceller: &TaskCanceller,
) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
let msg = CommonScriptMsg::Task(
ScriptThreadEventCategory::PerformanceTimelineTask,

4
components/script/task_source/user_interaction.rs
View file

@ -13,7 +13,7 @@ use servo_atoms::Atom;
use std::fmt;
use std::result::Result;
use std::sync::mpsc::Sender;
use task::{Task, TaskCanceller};
use task::{TaskBox, TaskCanceller};
use task_source::TaskSource;
#[derive(Clone, JSTraceable)]
@ -32,7 +32,7 @@ impl TaskSource for UserInteractionTaskSource {
canceller: &TaskCanceller,
) -> Result<(), ()>
where
T: Task + 'static,
T: TaskBox + 'static,
{
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
ScriptThreadEventCategory::InputEvent,