diff options
| -rw-r--r-- | components/script/script_thread.rs | 32 | ||||
| -rw-r--r-- | components/script/task_source/dom_manipulation.rs | 4 | ||||
| -rw-r--r-- | components/script/task_source/user_interaction.rs | 4 |
3 files changed, 21 insertions, 19 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index cfd7715994b..a576af4407e 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -221,24 +221,35 @@ pub struct CancellableRunnable<T: Runnable + Send> { inner: Box<T>, } -impl<T: Runnable + Send> Runnable for CancellableRunnable<T> { +impl<T> CancellableRunnable<T> +where + T: Runnable + Send, +{ fn is_cancelled(&self) -> bool { - self.cancelled.as_ref() - .map(|cancelled| cancelled.load(Ordering::SeqCst)) - .unwrap_or(false) + self.cancelled.as_ref().map_or(false, |cancelled| { + cancelled.load(Ordering::SeqCst) + }) } +} +impl<T> Runnable for CancellableRunnable<T> +where + T: Runnable + Send, +{ fn main_thread_handler(self: Box<CancellableRunnable<T>>, script_thread: &ScriptThread) { - self.inner.main_thread_handler(script_thread); + if !self.is_cancelled() { + self.inner.main_thread_handler(script_thread); + } } fn handler(self: Box<CancellableRunnable<T>>) { - self.inner.handler() + if !self.is_cancelled() { + self.inner.handler() + } } } pub trait Runnable { - fn is_cancelled(&self) -> bool { false } fn name(&self) -> &'static str { unsafe { intrinsics::type_name::<Self>() } } fn handler(self: Box<Self>) {} fn main_thread_handler(self: Box<Self>, _script_thread: &ScriptThread) { self.handler(); } @@ -1281,12 +1292,7 @@ impl ScriptThread { 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). - if !runnable.is_cancelled() { - debug!("Running runnable."); - runnable.main_thread_handler(self) - } else { - debug!("Not running cancelled runnable."); - } + runnable.main_thread_handler(self) } MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(reports_chan)) => self.collect_reports(reports_chan), diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs index fe25c5f2486..2ba5e297ade 100644 --- a/components/script/task_source/dom_manipulation.rs +++ b/components/script/task_source/dom_manipulation.rs @@ -71,8 +71,6 @@ impl fmt::Debug for DOMManipulationTask { impl DOMManipulationTask { pub fn handle_task(self, script_thread: &ScriptThread) { - if !self.0.is_cancelled() { - self.0.main_thread_handler(script_thread); - } + self.0.main_thread_handler(script_thread); } } diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs index c2341cbf82c..1969ee0a41a 100644 --- a/components/script/task_source/user_interaction.rs +++ b/components/script/task_source/user_interaction.rs @@ -62,8 +62,6 @@ impl fmt::Debug for UserInteractionTask { impl UserInteractionTask { pub fn handle_task(self, script_thread: &ScriptThread) { - if !self.0.is_cancelled() { - self.0.main_thread_handler(script_thread); - } + self.0.main_thread_handler(script_thread); } } |