aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/testbinding.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-04-29 13:59:04 -0400
committerGitHub <noreply@github.com>2019-04-29 13:59:04 -0400
commit852223b08a007e348d0c8e64b9eeed6ab0432b4f (patch)
treeedae21502c7544b7361b96195204d18e2d9b9c66 /components/script/dom/testbinding.rs
parent67beaa46e2015643e76becf18f415430ecb382bf (diff)
parent3229af509f9931f85a1372323f90427d2ad5898d (diff)
downloadservo-852223b08a007e348d0c8e64b9eeed6ab0432b4f.tar.gz
servo-852223b08a007e348d0c8e64b9eeed6ab0432b4f.zip
Auto merge of #23253 - BartGitHub:refactor-promise-compartment, r=jdm
Refactor promise compartment <!-- Please describe your changes on the following line: --> This PR adds a mechanism to verify that certain code is executed inside a ```JSAutoCompartment```, and applies this to the ```Promise::new_in_current_compartment``` constructor. r? @jdm --- <!-- 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 #23167 <!-- Either: --> - [x] These changes do not require tests because they do not change existing functionality. <!-- 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/23253) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/testbinding.rs')
-rw-r--r--components/script/dom/testbinding.rs15
1 files changed, 11 insertions, 4 deletions
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index f5d64a478de..99e294e75e9 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -4,6 +4,7 @@
// check-tidy: no specs after this line
+use crate::compartments::{AlreadyInCompartment, InCompartment};
use crate::dom::bindings::callback::ExceptionHandling;
use crate::dom::bindings::codegen::Bindings::EventListenerBinding::EventListener;
use crate::dom::bindings::codegen::Bindings::FunctionBinding::Function;
@@ -1009,7 +1010,6 @@ impl TestBindingMethods for TestBinding {
);
}
- #[allow(unsafe_code)]
fn PromiseNativeHandler(
&self,
resolve: Option<Rc<SimpleCallback>>,
@@ -1021,7 +1021,11 @@ impl TestBindingMethods for TestBinding {
resolve.map(SimpleHandler::new),
reject.map(SimpleHandler::new),
);
- let p = unsafe { Promise::new_in_current_compartment(&global) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&global);
+ let p = Promise::new_in_current_compartment(
+ &global,
+ InCompartment::Already(&in_compartment_proof),
+ );
p.append_native_handler(&handler);
return p;
@@ -1044,9 +1048,12 @@ impl TestBindingMethods for TestBinding {
}
}
- #[allow(unsafe_code)]
fn PromiseAttribute(&self) -> Rc<Promise> {
- unsafe { Promise::new_in_current_compartment(&self.global()) }
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ Promise::new_in_current_compartment(
+ &self.global(),
+ InCompartment::Already(&in_compartment_proof),
+ )
}
fn AcceptPromise(&self, _promise: &Promise) {}