From 4910a23803193fa62a65e24443e3f1fcc086111c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 3 Nov 2013 11:16:28 +0100 Subject: [PATCH 1/3] Simplify Window wrapping. --- src/components/script/dom/window.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 3701c22554d..a98cbbec241 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -148,8 +148,8 @@ impl Reflectable for Window { self.eventtarget.mut_reflector() } - fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { - WindowBinding::Wrap(cx, scope, self) + fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { + unreachable!() } fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { @@ -229,10 +229,8 @@ impl Window { next_timer_handle: 0 }; + let global = WindowBinding::Wrap(cx, ptr::null(), win); 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| { JS_DefineProperty(cx, global, name, RUST_OBJECT_TO_JSVAL(global), From c693cb185cb9fc4159eaf4e3191845377d8413d7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 3 Nov 2013 11:48:20 +0100 Subject: [PATCH 2/3] Stop calling wrap_object_shared in WrapNewBindingObject and WrapNativeParent. Fixes #1083. --- src/components/script/dom/bindings/utils.rs | 23 ++++----------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 7eb70ff145f..5df2fe62fd7 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -584,39 +584,24 @@ impl Reflector { } #[fixed_stack_segment] -pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, +pub fn WrapNewBindingObject(cx: *JSContext, _scope: *JSObject, value: @mut Reflectable, vp: *mut JSVal) -> JSBool { unsafe { let reflector = value.mut_reflector(); let obj = reflector.get_jsobject(); - if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ { - *vp = RUST_OBJECT_TO_JSVAL(obj); - return 1; // JS_TRUE - } - - let obj = value.wrap_object_shared(cx, scope); - if obj.is_null() { - return 0; // JS_FALSE - } - - // MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx)); - reflector.set_jsobject(obj); + assert!(obj.is_not_null()); *vp = RUST_OBJECT_TO_JSVAL(obj); return JS_WrapValue(cx, cast::transmute(vp)); } } #[fixed_stack_segment] -pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Reflectable>) -> *JSObject { +pub fn WrapNativeParent(cx: *JSContext, _scope: *JSObject, mut p: Option<@mut Reflectable>) -> *JSObject { match p { Some(ref mut p) => { let obj = p.reflector().get_jsobject(); - if obj.is_not_null() { - return obj; - } - let obj = p.wrap_object_shared(cx, scope); - p.mut_reflector().set_jsobject(obj); + assert!(obj.is_not_null()); obj } None => unsafe { JS_GetGlobalObject(cx) } From 53731b62ae74f2c119ebc29944140be0ea0011af Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 3 Nov 2013 11:52:39 +0100 Subject: [PATCH 3/3] Remove Reflectable::wrap_object_shared. --- src/components/script/dom/bindings/element.rs | 7 +------ src/components/script/dom/bindings/node.rs | 6 +----- src/components/script/dom/bindings/utils.rs | 1 - src/components/script/dom/blob.rs | 6 +----- src/components/script/dom/characterdata.rs | 7 ++----- src/components/script/dom/clientrect.rs | 6 +----- src/components/script/dom/clientrectlist.rs | 6 +----- src/components/script/dom/document.rs | 8 -------- src/components/script/dom/domparser.rs | 6 +----- src/components/script/dom/element.rs | 6 +----- src/components/script/dom/event.rs | 8 -------- src/components/script/dom/eventtarget.rs | 9 --------- src/components/script/dom/formdata.rs | 6 +----- src/components/script/dom/htmlcollection.rs | 4 ---- src/components/script/dom/htmldocument.rs | 6 +----- src/components/script/dom/mouseevent.rs | 6 +----- src/components/script/dom/navigator.rs | 6 +----- src/components/script/dom/node.rs | 4 ---- src/components/script/dom/nodelist.rs | 6 +----- src/components/script/dom/uievent.rs | 6 +----- src/components/script/dom/validitystate.rs | 7 ++----- src/components/script/dom/window.rs | 4 ---- src/components/script/dom/windowproxy.rs | 10 +--------- 23 files changed, 18 insertions(+), 123 deletions(-) diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs index 82d677fdb19..8ad84023789 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -3,10 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::types::*; -use dom::bindings::codegen::*; use dom::bindings::utils::{Reflectable, Reflector, Traceable}; -use js::jsapi::{JSContext, JSObject, JSTracer}; +use js::jsapi::{JSContext, JSTracer}; // generate_cacheable_wrapper macro_rules! generate_cacheable_wrapper( @@ -50,10 +49,6 @@ macro_rules! generate_cacheable_wrapper_base( self.$parent.mut_reflector() } - fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { - $wrap(cx, scope, self) - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.$parent.GetParentObject(cx) } diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 8574c084062..1ad5c3b782a 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -9,7 +9,7 @@ use dom::node::{AbstractNode, ScriptView}; use std::cast; use std::libc; use std::ptr; -use js::jsapi::{JSContext, JSObject, JSTracer, JSTRACE_OBJECT, JS_CallTracer}; +use js::jsapi::{JSContext, JSTracer, JSTRACE_OBJECT, JS_CallTracer}; use servo_util::tree::TreeNodeRef; impl Reflectable for AbstractNode { @@ -21,10 +21,6 @@ impl Reflectable for AbstractNode { self.mut_node().mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - fail!(~"need to implement wrapping"); - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.node().GetParentObject(cx) } diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 5df2fe62fd7..0cd5456b34e 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -541,7 +541,6 @@ pub fn initialize_global(global: *JSObject) { pub trait Reflectable { fn reflector<'a>(&'a self) -> &'a Reflector; fn mut_reflector<'a>(&'a mut self) -> &'a mut Reflector; - fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject; fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable>; } diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 8d1ef93338a..90dcfc8a0ac 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -7,7 +7,7 @@ use dom::bindings::utils::Fallible; use dom::bindings::codegen::BlobBinding; use dom::window::Window; -use js::jsapi::{JSContext, JSObject}; +use js::jsapi::JSContext; pub struct Blob { reflector_: Reflector, @@ -42,10 +42,6 @@ impl Reflectable for Blob { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index d93d8faa534..4434bdcabf9 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -8,7 +8,8 @@ use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::AbstractDocument; use dom::node::{Node, NodeTypeId, ScriptView}; -use js::jsapi::{JSObject, JSContext}; + +use js::jsapi::JSContext; pub struct CharacterData { node: Node, @@ -67,10 +68,6 @@ impl Reflectable for CharacterData { self.node.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - fail!(~"need to implement wrapping"); - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.node.GetParentObject(cx) } diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs index 4dff815ae1f..9704c8ec4c5 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::ClientRectBinding; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::window::Window; -use js::jsapi::{JSObject, JSContext}; +use js::jsapi::JSContext; pub struct ClientRect { reflector_: Reflector, @@ -72,10 +72,6 @@ impl Reflectable for ClientRect { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs index d956964ff01..9f615294ae4 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -7,7 +7,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::clientrect::ClientRect; use dom::window::Window; -use js::jsapi::{JSObject, JSContext}; +use js::jsapi::JSContext; pub struct ClientRectList { reflector_: Reflector, @@ -58,10 +58,6 @@ impl Reflectable for ClientRectList { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 7723c079de4..da54a70f19e 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -160,10 +160,6 @@ impl Reflectable for AbstractDocument { self.mut_document().mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.document().GetParentObject(cx) } @@ -187,10 +183,6 @@ impl Reflectable for Document { self.node.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index 46947ad662a..df0b0d4f148 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -10,7 +10,7 @@ use dom::document::{AbstractDocument, Document, XML}; use dom::htmldocument::HTMLDocument; use dom::window::Window; -use js::jsapi::{JSContext, JSObject}; +use js::jsapi::JSContext; pub struct DOMParser { owner: @mut Window, //XXXjdm Document instead? @@ -61,10 +61,6 @@ impl Reflectable for DOMParser { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.owner as @mut Reflectable) } diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index ebcdd22e0c7..3cfddaa698b 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -16,7 +16,7 @@ use layout_interface::{ContentBoxesResponse}; use style; use servo_util::tree::{TreeNodeRef, ElementLike}; -use js::jsapi::{JSContext, JSObject}; +use js::jsapi::JSContext; use std::comm; use std::hashmap::HashMap; @@ -39,10 +39,6 @@ impl Reflectable for Element { self.node.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - fail!("no wrapping") - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.node.GetParentObject(cx) } diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 02acca10937..febd318cad7 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -133,10 +133,6 @@ impl Reflectable for AbstractEvent { self.mut_event().mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - fail!(~"doesn't make any sense"); - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.event().GetParentObject(cx) } @@ -281,10 +277,6 @@ impl Reflectable for Event { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index d477d0f8f47..92f913addf5 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::EventTargetBinding; use dom::bindings::utils::{Reflectable, Reflector, DOMString, Fallible, DerivedWrapper}; use dom::bindings::utils::{null_str_as_word_null, InvalidState}; use dom::bindings::codegen::EventListenerBinding::EventListener; @@ -119,10 +118,6 @@ impl Reflectable for AbstractEventTarget { self.mut_eventtarget().mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.eventtarget().GetParentObject(cx) } @@ -205,10 +200,6 @@ impl Reflectable for EventTarget { &mut self.reflector_ } - fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { - EventTargetBinding::Wrap(cx, scope, self) - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); // TODO(tkuehn): This only handles top-level pages. Needs to handle subframes. diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 0bff8ce41d7..e5b7d9d4881 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -8,7 +8,7 @@ use dom::bindings::codegen::FormDataBinding; use dom::blob::Blob; use dom::window::Window; -use js::jsapi::{JSObject, JSContext}; +use js::jsapi::JSContext; use std::hashmap::HashMap; @@ -58,10 +58,6 @@ impl Reflectable for FormData { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index b40057b6780..67e5560e1f0 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -69,10 +69,6 @@ impl Reflectable for HTMLCollection { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index 1fcd6ae3718..dc53c9f4700 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -10,7 +10,7 @@ use dom::htmlcollection::HTMLCollection; use dom::node::{AbstractNode, ScriptView, ElementNodeTypeId}; use dom::window::Window; -use js::jsapi::{JSObject, JSContext, JSTracer}; +use js::jsapi::{JSContext, JSTracer}; use servo_util::tree::{TreeNodeRef, ElementLike}; @@ -89,10 +89,6 @@ impl Reflectable for HTMLDocument { self.parent.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.parent.GetParentObject(cx) } diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index e33bd485932..4bf4a4ae069 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -11,7 +11,7 @@ use dom::uievent::UIEvent; use dom::window::Window; use dom::windowproxy::WindowProxy; -use js::jsapi::{JSObject, JSContext}; +use js::jsapi::JSContext; pub struct MouseEvent { parent: UIEvent, @@ -152,10 +152,6 @@ impl Reflectable for MouseEvent { self.parent.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.parent.GetParentObject(cx) } diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index 88ea1b7974c..fa256a35990 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -8,7 +8,7 @@ use dom::bindings::codegen::NavigatorBinding; use dom::window::Window; use script_task::{page_from_context}; -use js::jsapi::{JSContext, JSObject}; +use js::jsapi::JSContext; pub struct Navigator { reflector_: Reflector //XXXjdm cycle: window->navigator->window @@ -99,10 +99,6 @@ impl Reflectable for Navigator { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index a25421ddbb4..e2db42afe80 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -1057,10 +1057,6 @@ impl Reflectable for Node { self.eventtarget.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - fail!(~"need to implement wrapping"); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { match self.parent_node { Some(node) => Some(unsafe {node.as_cacheable_wrapper()}), diff --git a/src/components/script/dom/nodelist.rs b/src/components/script/dom/nodelist.rs index 1a48d874c15..2500f106f15 100644 --- a/src/components/script/dom/nodelist.rs +++ b/src/components/script/dom/nodelist.rs @@ -7,7 +7,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::node::{AbstractNode, ScriptView}; use dom::window::Window; -use js::jsapi::{JSObject, JSContext}; +use js::jsapi::JSContext; enum NodeListType { Simple(~[AbstractNode]), @@ -75,10 +75,6 @@ impl Reflectable for NodeList { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index 86f84cf25b5..97c193c846f 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -10,7 +10,7 @@ use dom::event::{AbstractEvent, Event, EventTypeId, UIEventTypeId}; use dom::window::Window; use dom::windowproxy::WindowProxy; -use js::jsapi::{JSObject, JSContext}; +use js::jsapi::JSContext; pub struct UIEvent { parent: Event, @@ -121,10 +121,6 @@ impl Reflectable for UIEvent { self.parent.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.parent.GetParentObject(cx) } diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs index bb89f11e1d7..471964c0737 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -5,7 +5,8 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::codegen::ValidityStateBinding; use dom::window::Window; -use js::jsapi::{JSContext, JSObject}; + +use js::jsapi::JSContext; pub struct ValidityState { reflector_: Reflector, @@ -75,10 +76,6 @@ impl Reflectable for ValidityState { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!(); - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { Some(self.window as @mut Reflectable) } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index a98cbbec241..e148cd8a2ad 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -148,10 +148,6 @@ impl Reflectable for Window { self.eventtarget.mut_reflector() } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - unreachable!() - } - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { None } diff --git a/src/components/script/dom/windowproxy.rs b/src/components/script/dom/windowproxy.rs index b5ff91f1c0d..fada574cb8b 100644 --- a/src/components/script/dom/windowproxy.rs +++ b/src/components/script/dom/windowproxy.rs @@ -5,7 +5,7 @@ use dom::bindings::utils::{Reflectable, Reflector}; use script_task::page_from_context; -use js::jsapi::{JSContext, JSObject}; +use js::jsapi::JSContext; pub struct WindowProxy { reflector_: Reflector @@ -17,10 +17,6 @@ impl WindowProxy { reflector_: Reflector::new() } } - - pub fn init_wrapper(@mut self, cx: *JSContext, scope: *JSObject) { - self.wrap_object_shared(cx, scope); - } } impl Reflectable for WindowProxy { @@ -32,10 +28,6 @@ impl Reflectable for WindowProxy { &mut self.reflector_ } - fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { - fail!("not yet implemented") - } - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe {