Skip to content

Fix ServiceWorker in multiprocess#26087

Merged
bors-servo merged 2 commits intoservo:masterfrom
gterzian:allow_service_workers_in_multiprocess
Apr 5, 2020
Merged

Fix ServiceWorker in multiprocess#26087
bors-servo merged 2 commits intoservo:masterfrom
gterzian:allow_service_workers_in_multiprocess

Conversation

@gterzian
Copy link
Copy Markdown
Member

@gterzian gterzian commented Apr 1, 2020 •
edited
Loading

FIX #15217
FIX #26100

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #___ (GitHub issue number if applicable)
  • There are tests for these changes OR
  • These changes do not require tests because ___

@highfive
Copy link
Copy Markdown

highfive commented Apr 1, 2020

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/pipeline.rs, components/constellation/sandboxing.rs
  • @cbrewster: components/constellation/pipeline.rs, components/constellation/sandboxing.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 1, 2020
@gterzian gterzian mentioned this pull request Apr 1, 2020
Closed
5 tasks
@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch from e7c0718 to 39cc57c Compare April 1, 2020 17:50
@jdm
Copy link
Copy Markdown
Member

jdm commented Apr 2, 2020

I'm impressed by how much more readable the resulting infrastructure is here.

@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch 6 times, most recently from 896e62f to ad1f274 Compare April 4, 2020 06:23
@gterzian
Copy link
Copy Markdown
Member Author

gterzian commented Apr 4, 2020

@bors-servo try=wpt

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 4, 2020

⌛ Trying commit ad1f274 with merge 36520f5...

bors-servo added a commit that referenced this pull request Apr 4, 2020
@bors-servo
Auto merge of #26087 - gterzian:allow_service_workers_in_multiprocess…
36520f5 
…, r=<try>

[WIP] 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. -->
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 4, 2020

☀️ Test successful - status-taskcluster
State: approved= try=True

@gterzian gterzian changed the title [WIP] Fix ServiceWorker in multiprocess Fix ServiceWorker in multiprocess Apr 4, 2020
@gterzian
Copy link
Copy Markdown
Member Author

gterzian commented Apr 4, 2020

Ok this one is ready for review. @SimonSapin r? or @jdm r?

@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch from ad1f274 to 077c1bb Compare April 4, 2020 07:45
@gterzian gterzian mentioned this pull request Apr 4, 2020
Open
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 4, 2020

☔ The latest upstream changes (presumably #26106) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Apr 4, 2020
@gterzian gterzian removed the S-needs-rebase There are merge conflict errors. label Apr 4, 2020
@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch from 077c1bb to 5883bf8 Compare April 4, 2020 11:52
@CYBAI
Copy link
Copy Markdown
Member

CYBAI commented Apr 4, 2020

👀

error[E0599]: no method named `register_with_background_hang_monitor` found for enum `constellation::sandboxing::UnprivilegedContent` in the current scope
    --> components/servo/lib.rs:1018:38
     |
1018 |                 unprivileged_content.register_with_background_hang_monitor()
     |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ method not found in `constellation::sandboxing::UnprivilegedContent`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0599`.
error: could not compile `libservo`.

@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch from 5883bf8 to acf9d95 Compare April 4, 2020 12:40
@jdm
Copy link
Copy Markdown
Member

jdm commented Apr 4, 2020

@bors-servo r+

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 4, 2020

📌 Commit acf9d95 has been approved by jdm

@highfive highfive assigned jdm and unassigned SimonSapin Apr 4, 2020
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

⌛ Trying commit 921ad76 with merge a3a0f2a...

bors-servo added a commit that referenced this pull request Apr 5, 2020
@bors-servo
Auto merge of #26087 - gterzian:allow_service_workers_in_multiprocess…
a3a0f2a 
…, r=<try>

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. -->
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

💔 Test failed - status-taskcluster

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Apr 5, 2020
@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch from 921ad76 to 8841083 Compare April 5, 2020 13:50
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Apr 5, 2020
@gterzian
Copy link
Copy Markdown
Member Author

gterzian commented Apr 5, 2020

@bors-servo try

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

⌛ Trying commit 8841083 with merge 1f1f488...

bors-servo added a commit that referenced this pull request Apr 5, 2020
@bors-servo
Auto merge of #26087 - gterzian:allow_service_workers_in_multiprocess…
1f1f488 
…, r=<try>

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. -->
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

💔 Test failed - status-taskcluster

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Apr 5, 2020
@gterzian gterzian force-pushed the allow_service_workers_in_multiprocess branch from 8841083 to 1e017a7 Compare April 5, 2020 14:44
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Apr 5, 2020
@gterzian
Copy link
Copy Markdown
Member Author

gterzian commented Apr 5, 2020 •
edited
Loading

@bors-servo r=jdm (I have since mainly moved some compiler flags around)

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

📌 Commit 1e017a7 has been approved by jdm

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 5, 2020
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

⌛ Testing commit 1e017a7 with merge ade9fc9...

bors-servo added a commit that referenced this pull request Apr 5, 2020
@bors-servo
Auto merge of #26087 - gterzian:allow_service_workers_in_multiprocess…
ade9fc9 
…, 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. -->
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

💡 This pull request was already approved, no need to approve it again.

  • This pull request is currently being tested. If there's no response from the continuous integration service, you may use retry to trigger a build again.

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

📌 Commit 1e017a7 has been approved by jdm

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

⌛ Testing commit 1e017a7 with merge ae49473...

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Apr 5, 2020

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing ae49473 to master...

@bors-servo bors-servo merged commit ae49473 into servo:master Apr 5, 2020
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 5, 2020
@gterzian gterzian deleted the allow_service_workers_in_multiprocess branch April 5, 2020 15:19
@bors-servo bors-servo mentioned this pull request Apr 5, 2020
Merged
4 tasks
@gterzian gterzian mentioned this pull request Nov 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jdm jdm

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ServiceWorker: allow for a network mediator per origin Service worker code only supports a single content process

6 participants

@gterzian @highfive @jdm @bors-servo @CYBAI @SimonSapin