diff options
author | Agustin Chiappe Berrini <jnieve@gmail.com> | 2018-09-02 08:18:22 -0400 |
---|---|---|
committer | AgustinCB <jnieve@gmail.com> | 2018-09-04 09:17:11 -0400 |
commit | e286fdcc536df0cae9020a677380ffe2fa494566 (patch) | |
tree | f9bcfc3d8283f1bc015adfa4249d9276d69088cb /components/script/script_runtime.rs | |
parent | b211e45bb0106127edbedb31cb36209da3934eeb (diff) | |
download | servo-e286fdcc536df0cae9020a677380ffe2fa494566.tar.gz servo-e286fdcc536df0cae9020a677380ffe2fa494566.zip |
Add the TaskSourceName to CommonScriptMsg::Task
Update QueuedTaskConversion and the TaskQueue to use it
Diffstat (limited to 'components/script/script_runtime.rs')
-rw-r--r-- | components/script/script_runtime.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index b5d598d1c79..6758e3bd852 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -43,6 +43,7 @@ use std::panic::AssertUnwindSafe; use std::ptr; use style::thread_state::{self, ThreadState}; use task::TaskBox; +use task_source::TaskSourceName; use time::{Tm, now}; /// Common messages used to control the event loops in both the script and the worker @@ -51,14 +52,14 @@ pub enum CommonScriptMsg { /// supplied channel. CollectReports(ReportsChan), /// Generic message that encapsulates event handling. - Task(ScriptThreadEventCategory, Box<TaskBox>, Option<PipelineId>), + Task(ScriptThreadEventCategory, Box<TaskBox>, Option<PipelineId>, TaskSourceName), } impl fmt::Debug for CommonScriptMsg { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { CommonScriptMsg::CollectReports(_) => write!(f, "CollectReports(...)"), - CommonScriptMsg::Task(ref category, ref task, _) => { + CommonScriptMsg::Task(ref category, ref task, _, _) => { f.debug_tuple("Task").field(category).field(task).finish() }, } |