Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Create a helper API for entering a DOM object's compartment

Browse source 
Revert some unnecessary changes

Fix fmt errors
This commit is contained in:
Kamil Niski 2019-05-04 11:27:21 +02:00
parent 84786add22
commit adb402487e
14 changed files with 45 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/filereader.rs
View file

@ -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::enter_realm;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::BlobBinding::BlobMethods;
use crate::dom::bindings::codegen::Bindings::FileReaderBinding::{
@ -28,7 +29,6 @@ use base64;
use dom_struct::dom_struct;
use encoding_rs::{Encoding, UTF_8};
use js::jsapi::Heap;
use js::jsapi::JSAutoRealm;
use js::jsapi::JSContext;
use js::jsapi::JSObject;
use js::jsval::{self, JSVal};
@ -262,7 +262,7 @@ impl FileReader {
FileReader::perform_readastext(&fr.result, data, &blob_contents)
},
FileReaderFunction::ReadAsArrayBuffer => {
let _ac = JSAutoRealm::new(fr.global().get_cx(), *fr.reflector().get_jsobject());
let _ac = enter_realm(&*fr);
FileReader::perform_readasarraybuffer(
&fr.result,
fr.global().get_cx(),