diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-09-07 14:53:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 14:53:35 -0500 |
| commit | 867a982fa71b26cec3788e1c825dd9addb9725f9 (patch) | |
| tree | 79581b56d9cfb256190b11d31a42508442e96afb /components/script/task_source | |
| parent | 8868d2223dbb28b07ae1936095bc9ec644fe58a7 (diff) | |
| parent | 17a1dd938544a54b7457a42246872ebba1ec9bd5 (diff) | |
| download | servo-867a982fa71b26cec3788e1c825dd9addb9725f9.tar.gz servo-867a982fa71b26cec3788e1c825dd9addb9725f9.zip | |
Auto merge of #18407 - servo:kill-is-cancelled, r=emilio
Kill Runnable::is_cancelled ⚔️
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18407)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/task_source')
| -rw-r--r-- | components/script/task_source/dom_manipulation.rs | 4 | ||||
| -rw-r--r-- | components/script/task_source/user_interaction.rs | 4 |
2 files changed, 2 insertions, 6 deletions
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); } } |