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/script_task.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/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 86e1493409c..87f2d55f615 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -49,7 +49,7 @@ use hyper::mime::{Mime, SubLevel, TopLevel}; use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::router::ROUTER; use js::glue::CollectServoSizes; -use js::jsapi::{DOMProxyShadowsResult, HandleId, HandleObject, RootedValue, SetDOMProxyInformation}; +use js::jsapi::{DOMProxyShadowsResult, HandleId, HandleObject, RootedValue}; use js::jsapi::{DisableIncrementalGC, JS_AddExtraGCRootsTracer, JS_SetWrapObjectCallbacks}; use js::jsapi::{GCDescription, GCProgress, JSGCInvocationKind, SetGCSliceCallback}; use js::jsapi::{JSAutoRequest, JSGCStatus, JS_GetRuntime, JS_SetGCCallback, SetDOMCallbacks}; @@ -588,7 +588,7 @@ unsafe extern "C" fn debug_gc_callback(_rt: *mut JSRuntime, status: JSGCStatus, } } -unsafe extern "C" fn shadow_check_callback(_cx: *mut JSContext, +pub unsafe extern "C" fn shadow_check_callback(_cx: *mut JSContext, _object: HandleObject, _id: HandleId) -> DOMProxyShadowsResult { // XXX implement me DOMProxyShadowsResult::ShadowCheckFailed @@ -704,7 +704,6 @@ impl ScriptTask { unsafe { unsafe extern "C" fn empty_wrapper_callback(_: *mut JSContext, _: *mut JSObject) -> bool { true } - SetDOMProxyInformation(ptr::null(), 0, Some(shadow_check_callback)); SetDOMCallbacks(runtime.rt(), &DOM_CALLBACKS); SetPreserveWrapperCallback(runtime.rt(), Some(empty_wrapper_callback)); // Pre barriers aren't working correctly at the moment |