aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/worklet.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/worklet.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/worklet.rs')
-rw-r--r--components/script/dom/worklet.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/components/script/dom/worklet.rs b/components/script/dom/worklet.rs
index 357a52bb482..90421efac61 100644
--- a/components/script/dom/worklet.rs
+++ b/components/script/dom/worklet.rs
@@ -10,6 +10,7 @@
//! thread pool implementation, which only performs GC or code loading on
//! a backup thread, not on the primary worklet thread.
+use crate::compartments::{AlreadyInCompartment, InCompartment};
use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestCredentials;
use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowBinding::WindowMethods;
use crate::dom::bindings::codegen::Bindings::WorkletBinding::WorkletMethods;
@@ -110,10 +111,14 @@ impl Worklet {
impl WorkletMethods for Worklet {
/// <https://drafts.css-houdini.org/worklets/#dom-worklet-addmodule>
- #[allow(unsafe_code)]
fn AddModule(&self, module_url: USVString, options: &WorkletOptions) -> Rc<Promise> {
// Step 1.
- let promise = unsafe { Promise::new_in_current_compartment(self.window.upcast()) };
+ let global = self.window.upcast();
+ let in_compartment_proof = AlreadyInCompartment::assert(&global);
+ let promise = Promise::new_in_current_compartment(
+ &global,
+ InCompartment::Already(&in_compartment_proof),
+ );
// Step 3.
let module_url_record = match self.window.Document().base_url().join(&module_url.0) {