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

Auto merge of #7338 - jxs:master, r=Ms2ger

Browse source 
Move RegisterBindings::RegisterProxyHandlers call into script::init

closes #7336
This commit is contained in:
bors-servo 2015-08-24 11:52:03 -06:00
commit 9bb97319a2
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/lib.rs
View file

@ -98,6 +98,8 @@ mod devtools;
mod horribly_inefficient_timers; mod horribly_inefficient_timers;
mod webdriver_handlers; mod webdriver_handlers;
use dom::bindings::codegen::RegisterBindings;
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn perform_platform_specific_initialization() { fn perform_platform_specific_initialization() {
@ -123,5 +125,9 @@ pub fn init() {
assert_eq!(js::jsapi::JS_Init(), 1); assert_eq!(js::jsapi::JS_Init(), 1);
} }
// Create the global vtables used by the (generated) DOM
// bindings to implement JS proxies.
RegisterBindings::RegisterProxyHandlers();
perform_platform_specific_initialization(); perform_platform_specific_initialization();
} }

5
components/servo/lib.rs
View file

@ -42,8 +42,6 @@ use compositing::{CompositorProxy, CompositorTask, Constellation};
use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::ConstellationChan;
use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::Msg as ConstellationMsg;
use script::dom::bindings::codegen::RegisterBindings;
use net::image_cache_task::new_image_cache_task; use net::image_cache_task::new_image_cache_task;
use net::resource_task::new_resource_task; use net::resource_task::new_resource_task;
use net::storage_task::StorageTaskFactory; use net::storage_task::StorageTaskFactory;
@ -82,9 +80,6 @@ impl Browser {
let opts = opts::get(); let opts = opts::get();
script::init(); script::init();
// Create the global vtables used by the (generated) DOM
// bindings to implement JS proxies.
RegisterBindings::RegisterProxyHandlers();
// Get both endpoints of a special channel for communication between // Get both endpoints of a special channel for communication between
// the client window and the compositor. This channel is unique because // the client window and the compositor. This channel is unique because