aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/compartments.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/compartments.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/compartments.rs')
-rw-r--r--components/script/compartments.rs34
1 files changed, 34 insertions, 0 deletions
diff --git a/components/script/compartments.rs b/components/script/compartments.rs
new file mode 100644
index 00000000000..aedabca773e
--- /dev/null
+++ b/components/script/compartments.rs
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::globalscope::GlobalScope;
+use js::jsapi::{GetCurrentRealmOrNull, JSAutoCompartment};
+
+pub struct AlreadyInCompartment(());
+
+impl AlreadyInCompartment {
+ #![allow(unsafe_code)]
+ pub fn assert(global: &GlobalScope) -> AlreadyInCompartment {
+ unsafe {
+ assert!(!GetCurrentRealmOrNull(global.get_cx()).is_null());
+ }
+ AlreadyInCompartment(())
+ }
+}
+
+#[derive(Clone, Copy)]
+pub enum InCompartment<'a> {
+ Already(&'a AlreadyInCompartment),
+ Entered(&'a JSAutoCompartment),
+}
+
+impl<'a> InCompartment<'a> {
+ pub fn in_compartment(token: &AlreadyInCompartment) -> InCompartment {
+ InCompartment::Already(token)
+ }
+
+ pub fn entered(token: &JSAutoCompartment) -> InCompartment {
+ InCompartment::Entered(token)
+ }
+}