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

Simplify Window wrapping.

Browse source
This commit is contained in:
Ms2ger 2013-11-03 11:16:28 +01:00
parent 5626846d7c
commit 4910a23803
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/script/dom/window.rs
View file

@ -148,8 +148,8 @@ impl Reflectable for Window {
self.eventtarget.mut_reflector() self.eventtarget.mut_reflector()
} }
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
WindowBinding::Wrap(cx, scope, self) unreachable!()
} }
fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> {
@ -229,10 +229,8 @@ impl Window {
next_timer_handle: 0 next_timer_handle: 0
}; };
let global = WindowBinding::Wrap(cx, ptr::null(), win);
unsafe { unsafe {
let reflector = ptr::to_unsafe_ptr(win.reflector());
win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope
let global = (*reflector).object;
do "window".to_c_str().with_ref |name| { do "window".to_c_str().with_ref |name| {
JS_DefineProperty(cx, global, name, JS_DefineProperty(cx, global, name,
RUST_OBJECT_TO_JSVAL(global), RUST_OBJECT_TO_JSVAL(global),