diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-29 13:59:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-29 13:59:04 -0400 |
commit | 852223b08a007e348d0c8e64b9eeed6ab0432b4f (patch) | |
tree | edae21502c7544b7361b96195204d18e2d9b9c66 /components/script/body.rs | |
parent | 67beaa46e2015643e76becf18f415430ecb382bf (diff) | |
parent | 3229af509f9931f85a1372323f90427d2ad5898d (diff) | |
download | servo-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/body.rs')
-rw-r--r-- | components/script/body.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/components/script/body.rs b/components/script/body.rs index 9285fd110d2..1e18bc565a6 100644 --- a/components/script/body.rs +++ b/components/script/body.rs @@ -2,6 +2,7 @@ * 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::compartments::{AlreadyInCompartment, InCompartment}; use crate::dom::bindings::codegen::Bindings::FormDataBinding::FormDataMethods; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::reflector::DomObject; @@ -49,9 +50,12 @@ pub enum FetchedData { // https://fetch.spec.whatwg.org/#concept-body-consume-body #[allow(unrooted_must_root)] -#[allow(unsafe_code)] pub fn consume_body<T: BodyOperations + DomObject>(object: &T, body_type: BodyType) -> Rc<Promise> { - let promise = unsafe { Promise::new_in_current_compartment(&object.global()) }; + let in_compartment_proof = AlreadyInCompartment::assert(&object.global()); + let promise = Promise::new_in_current_compartment( + &object.global(), + InCompartment::Already(&in_compartment_proof), + ); // Step 1 if object.get_body_used() || object.is_locked() { |