diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-21 15:26:38 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-21 15:26:38 +0530 |
| commit | 7ccdc42a660bed7ac3bd3ad110567b79cba012ff (patch) | |
| tree | 70f9c18ef198053cb6e8062667dd77386a0ab553 /components/script/lib.rs | |
| parent | 585d2d5c8c4e59be20ab9660dab75fc55438e247 (diff) | |
| parent | 1c9ce04320a6c42b9877a750d755ab20a37f3ed4 (diff) | |
| download | servo-7ccdc42a660bed7ac3bd3ad110567b79cba012ff.tar.gz servo-7ccdc42a660bed7ac3bd3ad110567b79cba012ff.zip | |
Auto merge of #8627 - rilut:refactor-script, r=Ms2ger
Move SetDOMProxyInformation() call from script_task.rs to script/lib.rs
Actually, I'm not sure whether to move `unsafe extern "C" fn shadow_check_callback` from script_task.rs to lib.rs or to keep it there. cc: @wenderen
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8627)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/lib.rs')
| -rw-r--r-- | components/script/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script/lib.rs b/components/script/lib.rs index 3ef9edff9ff..cd2a0720ce2 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -99,6 +99,8 @@ mod unpremultiplytable; mod webdriver_handlers; use dom::bindings::codegen::RegisterBindings; +use js::jsapi::SetDOMProxyInformation; +use std::ptr; #[cfg(target_os = "linux")] #[allow(unsafe_code)] @@ -145,6 +147,7 @@ fn perform_platform_specific_initialization() {} pub fn init() { unsafe { assert_eq!(js::jsapi::JS_Init(), true); + SetDOMProxyInformation(ptr::null(), 0, Some(script_task::shadow_check_callback)); } // Create the global vtables used by the (generated) DOM |