diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-06 03:33:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-06 03:33:08 -0400 |
commit | be1e0690eb890ef785cee76e3a180f9265d820b8 (patch) | |
tree | 3448838c31cd6873b3a2383a1586e0c205aa9743 /components/script/dom/permissions.rs | |
parent | 967efc7fbc0fdfe55eeb9c1f6ac9f3df933f72d9 (diff) | |
parent | 60ba3d25730815817abe60f5fdbed1fa4ff2a553 (diff) | |
download | servo-be1e0690eb890ef785cee76e3a180f9265d820b8.tar.gz servo-be1e0690eb890ef785cee76e3a180f9265d820b8.zip |
Auto merge of #23158 - BartGitHub:promise-constructor, r=jdm
Promise constructor
In this PR, measures are taken that prevent the ```Promise::new``` constructor from being used outside a compartment.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22982 (GitHub issue number if applicable)
<!-- Either: -->
- [x] These changes do not require tests because no new functionality is added.
<!-- 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. -->
<!-- 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/23158)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/permissions.rs')
-rw-r--r-- | components/script/dom/permissions.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs index 3732c60d191..6886532d1ab 100644 --- a/components/script/dom/permissions.rs +++ b/components/script/dom/permissions.rs @@ -87,6 +87,7 @@ impl Permissions { // https://w3c.github.io/permissions/#dom-permissions-query // https://w3c.github.io/permissions/#dom-permissions-request // https://w3c.github.io/permissions/#dom-permissions-revoke + #[allow(unsafe_code)] fn manipulate( &self, op: Operation, @@ -97,7 +98,7 @@ impl Permissions { // (Query, Request) Step 3. let p = match promise { Some(promise) => promise, - None => Promise::new(&self.global()), + None => unsafe { Promise::new_in_current_compartment(&self.global()) }, }; // (Query, Request, Revoke) Step 1. |