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

Reformat some task-related functions

Browse source
This commit is contained in:
Anthony Ramine 2017-09-08 10:19:06 +02:00
parent 35a7252254
commit 53d30d85b3
3 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/script_thread.rs
View file

@ -1281,19 +1281,21 @@ impl ScriptThread {
fn handle_msg_from_script(&self, msg: MainThreadScriptMsg) { fn handle_msg_from_script(&self, msg: MainThreadScriptMsg) {
match msg { match msg {
MainThreadScriptMsg::Navigate(parent_pipeline_id, load_data, replace) => MainThreadScriptMsg::Navigate(parent_pipeline_id, load_data, replace) => {
self.handle_navigate(parent_pipeline_id, None, load_data, replace), self.handle_navigate(parent_pipeline_id, None, load_data, replace)
MainThreadScriptMsg::ExitWindow(id) => },
self.handle_exit_window_msg(id), MainThreadScriptMsg::ExitWindow(id) => {
self.handle_exit_window_msg(id)
},
MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg(_, runnable)) => { MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg(_, runnable)) => {
// The category of the runnable is ignored by the pattern, however
// it is still respected by profiling (see categorize_msg).
runnable.main_thread_handler(self) runnable.main_thread_handler(self)
} }
MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(reports_chan)) => MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(chan)) => {
self.collect_reports(reports_chan), self.collect_reports(chan)
MainThreadScriptMsg::WorkletLoaded(pipeline_id) => },
self.handle_worklet_loaded(pipeline_id), MainThreadScriptMsg::WorkletLoaded(pipeline_id) => {
self.handle_worklet_loaded(pipeline_id)
},
} }
} }

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

@ -25,11 +25,14 @@ impl fmt::Debug for DOMManipulationTaskSource {
} }
impl TaskSource for DOMManipulationTaskSource { impl TaskSource for DOMManipulationTaskSource {
fn queue_with_wrapper<T>(&self, fn queue_with_wrapper<T>(
msg: Box<T>, &self,
wrapper: &RunnableWrapper) msg: Box<T>,
-> Result<(), ()> wrapper: &RunnableWrapper,
where T: Runnable + Send + 'static { ) -> Result<(), ()>
where
T: Runnable + Send + 'static,
{
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg( let msg = MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg(
ScriptThreadEventCategory::ScriptEvent, ScriptThreadEventCategory::ScriptEvent,
wrapper.wrap_runnable(msg), wrapper.wrap_runnable(msg),

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

@ -25,11 +25,14 @@ impl fmt::Debug for UserInteractionTaskSource {
} }
impl TaskSource for UserInteractionTaskSource { impl TaskSource for UserInteractionTaskSource {
fn queue_with_wrapper<T>(&self, fn queue_with_wrapper<T>(
msg: Box<T>, &self,
wrapper: &RunnableWrapper) msg: Box<T>,
-> Result<(), ()> wrapper: &RunnableWrapper,
where T: Runnable + Send + 'static { ) -> Result<(), ()>
where
T: Runnable + Send + 'static,
{
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg( let msg = MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg(
ScriptThreadEventCategory::InputEvent, ScriptThreadEventCategory::InputEvent,
wrapper.wrap_runnable(msg), wrapper.wrap_runnable(msg),