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

script: Ensure script is initialized before running script.

Browse source 
Fixes #14154
This commit is contained in:
Emilio Cobos Álvarez 2016-11-12 02:27:51 +01:00
parent d49840eeec
commit a7cee44f59
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/lib.rs
View file

@ -163,15 +163,17 @@ fn perform_platform_specific_initialization() {
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
fn perform_platform_specific_initialization() {} fn perform_platform_specific_initialization() {}
pub fn init_service_workers(sw_senders: SWManagerSenders) {
// Spawn the service worker manager passing the constellation sender
ServiceWorkerManager::spawn_manager(sw_senders);
}
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub fn init(sw_senders: SWManagerSenders) { pub fn init() {
unsafe { unsafe {
proxyhandler::init(); proxyhandler::init();
} }
// Spawn the service worker manager passing the constellation sender
ServiceWorkerManager::spawn_manager(sw_senders);
// Create the global vtables used by the (generated) DOM // Create the global vtables used by the (generated) DOM
// bindings to implement JS proxies. // bindings to implement JS proxies.
RegisterBindings::RegisterProxyHandlers(); RegisterBindings::RegisterProxyHandlers();

9
components/servo/lib.rs
View file

@ -170,6 +170,10 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
}) })
}; };
// Important that this call is done in a single-threaded fashion, we
// can't defer it after `create_constellation` has started.
script::init();
// Create the constellation, which maintains the engine // Create the constellation, which maintains the engine
// pipelines, including the script and layout threads, as well // pipelines, including the script and layout threads, as well
// as the navigation context. // as the navigation context.
@ -183,7 +187,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
webrender_api_sender.clone()); webrender_api_sender.clone());
// Send the constellation's swmanager sender to service worker manager thread // Send the constellation's swmanager sender to service worker manager thread
script::init(sw_senders); script::init_service_workers(sw_senders);
if cfg!(feature = "webdriver") { if cfg!(feature = "webdriver") {
if let Some(port) = opts.webdriver_port { if let Some(port) = opts.webdriver_port {
@ -339,7 +343,8 @@ pub fn run_content_process(token: String) {
// send the required channels to the service worker manager // send the required channels to the service worker manager
let sw_senders = unprivileged_content.swmanager_senders(); let sw_senders = unprivileged_content.swmanager_senders();
script::init(sw_senders); script::init();
script::init_service_workers(sw_senders);
unprivileged_content.start_all::<script_layout_interface::message::Msg, unprivileged_content.start_all::<script_layout_interface::message::Msg,
layout_thread::LayoutThread, layout_thread::LayoutThread,