diff options
Diffstat (limited to 'components/script/lib.rs')
-rw-r--r-- | components/script/lib.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/components/script/lib.rs b/components/script/lib.rs index 5125607219b..d7a57a28898 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -8,6 +8,7 @@ #![feature(mpsc_select)] #![feature(plugin)] #![feature(string_retain)] +#![feature(try_from)] #![feature(use_extern_macros)] #![deny(unsafe_code)] @@ -149,10 +150,7 @@ pub mod layout_exports { } use dom::bindings::codegen::RegisterBindings; -use dom::bindings::conversions::is_dom_proxy; use dom::bindings::proxyhandler; -use dom::bindings::utils::is_platform_object; -use js::jsapi::JSObject; use script_traits::SWManagerSenders; use serviceworker_manager::ServiceWorkerManager; @@ -203,11 +201,6 @@ pub fn init_service_workers(sw_senders: SWManagerSenders) { } #[allow(unsafe_code)] -unsafe extern "C" fn is_dom_object(obj: *mut JSObject) -> bool { - !obj.is_null() && (is_platform_object(obj) || is_dom_proxy(obj)) -} - -#[allow(unsafe_code)] pub fn init() { unsafe { proxyhandler::init(); @@ -215,8 +208,6 @@ pub fn init() { // Create the global vtables used by the (generated) DOM // bindings to implement JS proxies. RegisterBindings::RegisterProxyHandlers(); - - js::glue::InitializeMemoryReporter(Some(is_dom_object)); } perform_platform_specific_initialization(); |