Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle script private reference hooks properly

Browse source
This commit is contained in:
CYBAI 2020-07-15 18:16:43 +09:00
parent c2feaf14d5
commit 08723b0e37
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2608,7 +2608,7 @@ impl GlobalScope {
if GetScriptPrivate(*compiled_script).is_undefined() { if GetScriptPrivate(*compiled_script).is_undefined() {
debug!("Set script private for {}", script_base_url); debug!("Set script private for {}", script_base_url);
let module_script_data = Box::new(ModuleScript::new( let module_script_data = Rc::new(ModuleScript::new(
script_base_url, script_base_url,
fetch_options, fetch_options,
// We can't initialize an module owner here because // We can't initialize an module owner here because
@ -2619,7 +2619,7 @@ impl GlobalScope {
SetScriptPrivate( SetScriptPrivate(
*compiled_script, *compiled_script,
&PrivateValue(Box::into_raw(module_script_data) as *const _), &PrivateValue(Rc::into_raw(module_script_data) as *const _),
); );
} }

24
components/script/script_module.rs
View file

@ -44,6 +44,7 @@ use ipc_channel::router::ROUTER;
use js::jsapi::Handle as RawHandle; use js::jsapi::Handle as RawHandle;
use js::jsapi::HandleObject; use js::jsapi::HandleObject;
use js::jsapi::HandleValue as RawHandleValue; use js::jsapi::HandleValue as RawHandleValue;
use js::jsapi::Value;
use js::jsapi::{CompileModule, ExceptionStackBehavior, FinishDynamicModuleImport}; use js::jsapi::{CompileModule, ExceptionStackBehavior, FinishDynamicModuleImport};
use js::jsapi::{GetModuleResolveHook, JSRuntime, SetModuleResolveHook}; use js::jsapi::{GetModuleResolveHook, JSRuntime, SetModuleResolveHook};
use js::jsapi::{GetRequestedModules, SetModuleMetadataHook}; use js::jsapi::{GetRequestedModules, SetModuleMetadataHook};
@ -70,6 +71,7 @@ use net_traits::{ResourceFetchTiming, ResourceTimingType};
use servo_url::ServoUrl; use servo_url::ServoUrl;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::ffi; use std::ffi;
use std::mem;
use std::rc::Rc; use std::rc::Rc;
use std::str::FromStr; use std::str::FromStr;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -449,11 +451,11 @@ impl ModuleTree {
)))); ))));
} }
let module_script_data = Box::new(ModuleScript::new(url.clone(), options, Some(owner))); let module_script_data = Rc::new(ModuleScript::new(url.clone(), options, Some(owner)));
SetModulePrivate( SetModulePrivate(
module_script.get(), module_script.get(),
&PrivateValue(Box::into_raw(module_script_data) as *const _), &PrivateValue(Rc::into_raw(module_script_data) as *const _),
); );
debug!("module script of {} compile done", url); debug!("module script of {} compile done", url);
@ -1214,10 +1216,26 @@ pub unsafe fn EnsureModuleHooksInitialized(rt: *mut JSRuntime) {
SetModuleResolveHook(rt, Some(HostResolveImportedModule)); SetModuleResolveHook(rt, Some(HostResolveImportedModule));
SetModuleMetadataHook(rt, Some(HostPopulateImportMeta)); SetModuleMetadataHook(rt, Some(HostPopulateImportMeta));
SetScriptPrivateReferenceHooks(rt, None, None); SetScriptPrivateReferenceHooks(
rt,
Some(host_add_ref_top_level_script),
Some(host_release_top_level_script),
);
SetModuleDynamicImportHook(rt, Some(host_import_module_dynamically)); SetModuleDynamicImportHook(rt, Some(host_import_module_dynamically));
} }
#[allow(unsafe_code)]
unsafe extern "C" fn host_add_ref_top_level_script(value: *const Value) {
let val = Rc::from_raw((*value).to_private() as *const ModuleScript);
mem::forget(val.clone());
mem::forget(val);
}
#[allow(unsafe_code)]
unsafe extern "C" fn host_release_top_level_script(value: *const Value) {
let _val = Rc::from_raw((*value).to_private() as *const ModuleScript);
}
#[allow(unsafe_code)] #[allow(unsafe_code)]
/// <https://html.spec.whatwg.org/multipage/#hostimportmoduledynamically(referencingscriptormodule,-specifier,-promisecapability)> /// <https://html.spec.whatwg.org/multipage/#hostimportmoduledynamically(referencingscriptormodule,-specifier,-promisecapability)>
pub unsafe extern "C" fn host_import_module_dynamically( pub unsafe extern "C" fn host_import_module_dynamically(