Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Promise::resolve_native in fullscreen tasks

Browse source
This commit is contained in:
Anthony Ramine 2017-09-22 01:47:37 +02:00
parent af2e83f378
commit 5994e40070
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/element.rs
View file

@ -82,7 +82,7 @@ use html5ever::serialize;
use html5ever::serialize::SerializeOpts; use html5ever::serialize::SerializeOpts;
use html5ever::serialize::TraversalScope; use html5ever::serialize::TraversalScope;
use html5ever::serialize::TraversalScope::{ChildrenOnly, IncludeNode}; use html5ever::serialize::TraversalScope::{ChildrenOnly, IncludeNode};
use js::jsapi::{HandleValue, Heap, JSAutoCompartment}; use js::jsapi::Heap;
use js::jsval::JSVal; use js::jsval::JSVal;
use net_traits::request::CorsSettings; use net_traits::request::CorsSettings;
use ref_filter_map::ref_filter_map; use ref_filter_map::ref_filter_map;
@ -3075,12 +3075,7 @@ impl TaskOnce for ElementPerformFullscreenEnter {
document.upcast::<EventTarget>().fire_event(atom!("fullscreenchange")); document.upcast::<EventTarget>().fire_event(atom!("fullscreenchange"));
// Step 7.7 // Step 7.7
// JSAutoCompartment needs to be manually made. promise.resolve_native(&());
// Otherwise, Servo will crash.
let promise = self.promise.root();
let promise_cx = promise.global().get_cx();
let _ac = JSAutoCompartment::new(promise_cx, promise.reflector().get_jsobject().get());
promise.resolve(promise.global().get_cx(), HandleValue::undefined());
} }
} }
@ -3117,12 +3112,7 @@ impl TaskOnce for ElementPerformFullscreenExit {
document.upcast::<EventTarget>().fire_event(atom!("fullscreenchange")); document.upcast::<EventTarget>().fire_event(atom!("fullscreenchange"));
// Step 9.10 // Step 9.10
let promise = self.promise.root(); self.promise.root().resolve_native(&());
// JSAutoCompartment needs to be manually made.
// Otherwise, Servo will crash.
let promise_cx = promise.global().get_cx();
let _ac = JSAutoCompartment::new(promise_cx, promise.reflector().get_jsobject().get());
promise.resolve(promise.global().get_cx(), HandleValue::undefined());
} }
} }