diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-26 16:26:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-26 16:26:20 -0500 |
commit | a922c497fade0250123b86d7535838c9a8d3b0af (patch) | |
tree | 58d60290dab73537d294c8a81dbef091279dc01a /components/script/dom/window.rs | |
parent | 8e0aa68aaafd96abc589f185f7f863f96c553e26 (diff) | |
parent | 50a7111eb65155fc7a0bdb1646c4a2e0ebdd8f90 (diff) | |
download | servo-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/dom/window.rs')
-rw-r--r-- | components/script/dom/window.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 4ae94520f1f..ef8719ab8e6 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -106,8 +106,7 @@ use script_layout_interface::{PendingImageState, TrustedNodeAddress}; use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult}; use script_traits::{ConstellationControlMsg, DocumentState, HistoryEntryReplacement, LoadData}; use script_traits::{ - ScriptMsg, ScriptToConstellationChan, ScrollState, StructuredSerializedData, TimerEvent, - TimerEventId, + ScriptMsg, ScriptToConstellationChan, ScrollState, StructuredSerializedData, TimerEventId, }; use script_traits::{TimerSchedulerMsg, WindowSizeData, WindowSizeType}; use selectors::attr::CaseSensitivity; @@ -2206,7 +2205,6 @@ impl Window { constellation_chan: ScriptToConstellationChan, control_chan: IpcSender<ConstellationControlMsg>, scheduler_chan: IpcSender<TimerSchedulerMsg>, - timer_event_chan: IpcSender<TimerEvent>, layout_chan: Sender<Msg>, pipelineid: PipelineId, parent_info: Option<PipelineId>, @@ -2250,7 +2248,6 @@ impl Window { constellation_chan, scheduler_chan, resource_threads, - timer_event_chan, origin, microtask_queue, is_headless, |