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/fetch.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/fetch.rs')
-rw-r--r-- | components/script/fetch.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/fetch.rs b/components/script/fetch.rs index 01708d5c532..c3003e658a0 100644 --- a/components/script/fetch.rs +++ b/components/script/fetch.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::RequestBinding::RequestInfo; use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestInit; use crate::dom::bindings::codegen::Bindings::ResponseBinding::ResponseBinding::ResponseMethods; @@ -125,7 +126,6 @@ fn request_init_from_request(request: NetTraitsRequest) -> RequestBuilder { // https://fetch.spec.whatwg.org/#fetch-method #[allow(unrooted_must_root)] -#[allow(unsafe_code)] pub fn Fetch( global: &GlobalScope, input: RequestInfo, @@ -134,7 +134,8 @@ pub fn Fetch( let core_resource_thread = global.core_resource_thread(); // Step 1 - let promise = unsafe { Promise::new_in_current_compartment(global) }; + let aic = AlreadyInCompartment::assert(global); + let promise = Promise::new_in_current_compartment(global, InCompartment::Already(&aic)); let response = Response::new(global); // Step 2 |