diff options
author | bors-servo <servo-ops@mozilla.com> | 2020-04-05 11:02:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 11:02:08 -0400 |
commit | ae49473c25d61452d1cd02db03bc9760b6cd95c2 (patch) | |
tree | 3615866e8cf020b6e1efcadde7789df399d897d5 /components/script_traits/script_msg.rs | |
parent | 406eefb4b1e02a40638317290006ac8e828e0764 (diff) | |
parent | 1e017a7082e7649a4d2d2f2b8b8d1a1a23c7fb84 (diff) | |
download | servo-ae49473c25d61452d1cd02db03bc9760b6cd95c2.tar.gz servo-ae49473c25d61452d1cd02db03bc9760b6cd95c2.zip |
Auto merge of #26087 - gterzian:allow_service_workers_in_multiprocess, r=jdm
Fix ServiceWorker in multiprocess
<!-- Please describe your changes on the following line: -->
FIX #15217
FIX #26100
---
<!-- 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 #___ (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_traits/script_msg.rs')
-rw-r--r-- | components/script_traits/script_msg.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 918b4f4ff78..245a02ec6d2 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -370,11 +370,16 @@ pub struct DOMMessage { } /// Channels to allow service worker manager to communicate with constellation and resource thread +#[derive(Deserialize, Serialize)] pub struct SWManagerSenders { - /// sender for communicating with constellation + /// Sender of messages to the constellation. pub swmanager_sender: IpcSender<SWManagerMsg>, - /// sender for communicating with resource thread + /// Sender for communicating with resource thread. pub resource_sender: IpcSender<CoreResourceMsg>, + /// Sender of messages to the manager. + pub own_sender: IpcSender<ServiceWorkerMsg>, + /// Receiver of messages from the constellation. + pub receiver: IpcReceiver<ServiceWorkerMsg>, } /// Messages sent to Service Worker Manager thread @@ -393,6 +398,8 @@ pub enum ServiceWorkerMsg { /// Messages outgoing from the Service Worker Manager thread to constellation #[derive(Debug, Deserialize, Serialize)] pub enum SWManagerMsg { - /// Provide the constellation with a means of communicating with the Service Worker Manager - OwnSender(IpcSender<ServiceWorkerMsg>), + /// Placeholder to keep the enum, + /// as it will be needed when implementing + /// https://github.com/servo/servo/issues/24660 + PostMessageToClient, } |