aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/testbinding.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-04-06 03:33:08 -0400
committerGitHub <noreply@github.com>2019-04-06 03:33:08 -0400
commitbe1e0690eb890ef785cee76e3a180f9265d820b8 (patch)
tree3448838c31cd6873b3a2383a1586e0c205aa9743 /components/script/dom/testbinding.rs
parent967efc7fbc0fdfe55eeb9c1f6ac9f3df933f72d9 (diff)
parent60ba3d25730815817abe60f5fdbed1fa4ff2a553 (diff)
downloadservo-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/testbinding.rs')
-rw-r--r--components/script/dom/testbinding.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index 505e51325a9..f5d64a478de 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -1009,6 +1009,7 @@ impl TestBindingMethods for TestBinding {
);
}
+ #[allow(unsafe_code)]
fn PromiseNativeHandler(
&self,
resolve: Option<Rc<SimpleCallback>>,
@@ -1020,7 +1021,7 @@ impl TestBindingMethods for TestBinding {
resolve.map(SimpleHandler::new),
reject.map(SimpleHandler::new),
);
- let p = Promise::new(&global);
+ let p = unsafe { Promise::new_in_current_compartment(&global) };
p.append_native_handler(&handler);
return p;
@@ -1043,8 +1044,9 @@ impl TestBindingMethods for TestBinding {
}
}
+ #[allow(unsafe_code)]
fn PromiseAttribute(&self) -> Rc<Promise> {
- Promise::new(&self.global())
+ unsafe { Promise::new_in_current_compartment(&self.global()) }
}
fn AcceptPromise(&self, _promise: &Promise) {}