aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/task_source/timer.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-11-26 16:26:20 -0500
committerGitHub <noreply@github.com>2019-11-26 16:26:20 -0500
commita922c497fade0250123b86d7535838c9a8d3b0af (patch)
tree58d60290dab73537d294c8a81dbef091279dc01a /components/script/task_source/timer.rs
parent8e0aa68aaafd96abc589f185f7f863f96c553e26 (diff)
parent50a7111eb65155fc7a0bdb1646c4a2e0ebdd8f90 (diff)
downloadservo-a922c497fade0250123b86d7535838c9a8d3b0af.tar.gz
servo-a922c497fade0250123b86d7535838c9a8d3b0af.zip
Auto merge of #24758 - gterzian:impl_timer_task_source, r=nox
Implement timer-task-source, time-out service worker <!-- Please describe your changes on the following line: --> Implements the timer task-source, and folds the IPC glue-code into a single route set by the globalscope. Also switches service worker to using a dedicated "time-out" mechanism, which previously relied on the timer mechanism(and I think didn't actually implement script timers). --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #24747 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/task_source/timer.rs')
-rw-r--r--components/script/task_source/timer.rs42
1 files changed, 42 insertions, 0 deletions
diff --git a/components/script/task_source/timer.rs b/components/script/task_source/timer.rs
new file mode 100644
index 00000000000..cd134fb12a2
--- /dev/null
+++ b/components/script/task_source/timer.rs
@@ -0,0 +1,42 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
+use crate::task::{TaskCanceller, TaskOnce};
+use crate::task_source::{TaskSource, TaskSourceName};
+use msg::constellation_msg::PipelineId;
+use std::fmt;
+
+#[derive(JSTraceable)]
+/// https://html.spec.whatwg.org/multipage/#timer-task-source
+pub struct TimerTaskSource(pub Box<dyn ScriptChan + Send + 'static>, pub PipelineId);
+
+impl Clone for TimerTaskSource {
+ fn clone(&self) -> TimerTaskSource {
+ TimerTaskSource(self.0.clone(), self.1.clone())
+ }
+}
+
+impl fmt::Debug for TimerTaskSource {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ write!(f, "TimerTaskSource(...)")
+ }
+}
+
+impl TaskSource for TimerTaskSource {
+ const NAME: TaskSourceName = TaskSourceName::Timer;
+
+ fn queue_with_canceller<T>(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()>
+ where
+ T: TaskOnce + 'static,
+ {
+ let msg = CommonScriptMsg::Task(
+ ScriptThreadEventCategory::TimerEvent,
+ Box::new(canceller.wrap_task(task)),
+ Some(self.1),
+ Self::NAME,
+ );
+ self.0.send(msg).map_err(|_| ())
+ }
+}