diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-06 03:33:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-06 03:33:08 -0400 |
commit | be1e0690eb890ef785cee76e3a180f9265d820b8 (patch) | |
tree | 3448838c31cd6873b3a2383a1586e0c205aa9743 /components/script/dom/document.rs | |
parent | 967efc7fbc0fdfe55eeb9c1f6ac9f3df933f72d9 (diff) | |
parent | 60ba3d25730815817abe60f5fdbed1fa4ff2a553 (diff) | |
download | servo-be1e0690eb890ef785cee76e3a180f9265d820b8.tar.gz servo-be1e0690eb890ef785cee76e3a180f9265d820b8.zip |
Auto merge of #23158 - BartGitHub:promise-constructor, r=jdm
Promise constructor
In this PR, measures are taken that prevent the ```Promise::new``` constructor from being used outside a compartment.
---
<!-- 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 #22982 (GitHub issue number if applicable)
<!-- Either: -->
- [x] These changes do not require tests because no new functionality is added.
<!-- 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/23158)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r-- | components/script/dom/document.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index b3f08964502..3d890357e16 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -3129,9 +3129,10 @@ impl Document { } // https://fullscreen.spec.whatwg.org/#dom-element-requestfullscreen + #[allow(unsafe_code)] pub fn enter_fullscreen(&self, pending: &Element) -> Rc<Promise> { // Step 1 - let promise = Promise::new(&self.global()); + let promise = unsafe { Promise::new_in_current_compartment(&self.global()) }; let mut error = false; // Step 4 @@ -3195,10 +3196,11 @@ impl Document { } // https://fullscreen.spec.whatwg.org/#exit-fullscreen + #[allow(unsafe_code)] pub fn exit_fullscreen(&self) -> Rc<Promise> { let global = self.global(); // Step 1 - let promise = Promise::new(&global); + let promise = unsafe { Promise::new_in_current_compartment(&global) }; // Step 2 if self.fullscreen_element.get().is_none() { promise.reject_error(Error::Type(String::from("fullscreen is null"))); |