diff options
Diffstat (limited to 'components/script/dom/browsercontext.rs')
| -rw-r--r-- | components/script/dom/browsercontext.rs | 212 |
1 files changed, 105 insertions, 107 deletions
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index f51930f3f63..d4d13c1e4aa 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -2,11 +2,9 @@ * 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::conversions::native_from_reflector_jsmanaged; +use dom::bindings::conversions::native_from_handleobject; use dom::bindings::conversions::{ToJSValConvertible}; -use dom::bindings::js::{JS, JSRef, Temporary, Root}; -use dom::bindings::js::{OptionalRootable, OptionalOptionalRootable}; -use dom::bindings::js::{ResultRootable, Rootable}; +use dom::bindings::js::{JS, Root}; use dom::bindings::proxyhandler::{get_property_descriptor, fill_property_descriptor}; use dom::bindings::utils::{Reflectable, WindowProxyHandler}; use dom::bindings::utils::get_array_index_from_id; @@ -15,73 +13,72 @@ use dom::element::Element; use dom::window::Window; use dom::window::WindowHelpers; -use js::jsapi::{JSContext, JSObject, jsid, JSPropertyDescriptor}; +use js::jsapi::{JSContext, JSObject, JSPropertyDescriptor, JSErrNum}; +use js::jsapi::{HandleObject, HandleId, MutableHandle, MutableHandleValue}; use js::jsapi::{JS_AlreadyHasOwnPropertyById, JS_ForwardGetPropertyTo}; -use js::jsapi::{JS_GetPropertyDescriptorById, JS_DefinePropertyById}; -use js::jsapi::{JS_SetPropertyById}; -use js::jsval::JSVal; +use js::jsapi::{JS_GetPropertyDescriptorById, JS_DefinePropertyById6}; +use js::jsapi::{JS_ForwardSetPropertyTo, ObjectOpResult, RootedObject, RootedValue, Handle, HandleValue, Heap}; +use js::jsapi::{JSAutoRequest, JSAutoCompartment}; +use js::jsval::{ObjectValue, UndefinedValue}; use js::glue::{GetProxyPrivate}; use js::glue::{WrapperNew, CreateWrapperProxyHandler, ProxyTraps}; -use js::rust::with_compartment; -use js::{JSRESOLVE_QUALIFIED, JSRESOLVE_ASSIGNING}; +use js::{JSTrue, JSFalse}; use std::ptr; +use std::default::Default; -#[allow(raw_pointer_derive)] #[jstraceable] #[privatize] pub struct BrowserContext { history: Vec<SessionHistoryEntry>, active_index: usize, - window_proxy: *mut JSObject, + window_proxy: Heap<*mut JSObject>, frame_element: Option<JS<Element>>, } impl BrowserContext { - pub fn new(document: JSRef<Document>, frame_element: Option<JSRef<Element>>) -> BrowserContext { - let mut context = BrowserContext { + pub fn new(document: &Document, frame_element: Option<&Element>) -> BrowserContext { + BrowserContext { history: vec!(SessionHistoryEntry::new(document)), active_index: 0, - window_proxy: ptr::null_mut(), - frame_element: frame_element.map(JS::from_rooted), - }; - context.create_window_proxy(); - context + window_proxy: Heap::default(), + frame_element: frame_element.map(JS::from_ref), + } } - pub fn active_document(&self) -> Temporary<Document> { - Temporary::from_rooted(self.history[self.active_index].document.clone()) + pub fn active_document(&self) -> Root<Document> { + self.history[self.active_index].document.root() } - pub fn active_window(&self) -> Temporary<Window> { - let doc = self.active_document().root(); + pub fn active_window(&self) -> Root<Window> { + let doc = self.active_document(); doc.r().window() } - pub fn frame_element(&self) -> Option<Temporary<Element>> { - self.frame_element.map(Temporary::from_rooted) + pub fn frame_element(&self) -> Option<Root<Element>> { + self.frame_element.map(Root::from_rooted) } pub fn window_proxy(&self) -> *mut JSObject { - assert!(!self.window_proxy.is_null()); - self.window_proxy + assert!(!self.window_proxy.get().is_null()); + self.window_proxy.get() } #[allow(unsafe_code)] - fn create_window_proxy(&mut self) { - let win = self.active_window().root(); + pub fn create_window_proxy(&mut self) { + let win = self.active_window(); let win = win.r(); let WindowProxyHandler(handler) = win.windowproxy_handler(); assert!(!handler.is_null()); - let parent = win.reflector().get_jsobject(); let cx = win.get_cx(); - let wrapper = with_compartment(cx, parent, || unsafe { - WrapperNew(cx, parent, handler) - }); + let _ar = JSAutoRequest::new(cx); + let parent = win.reflector().get_jsobject(); + let _ac = JSAutoCompartment::new(cx, parent.get()); + let wrapper = unsafe { WrapperNew(cx, parent, handler) }; assert!(!wrapper.is_null()); - self.window_proxy = wrapper; + self.window_proxy.set(wrapper); } } @@ -96,20 +93,20 @@ pub struct SessionHistoryEntry { } impl SessionHistoryEntry { - fn new(document: JSRef<Document>) -> SessionHistoryEntry { + fn new(document: &Document) -> SessionHistoryEntry { SessionHistoryEntry { - document: JS::from_rooted(document), + document: JS::from_ref(document), children: vec!() } } } #[allow(unsafe_code)] -unsafe fn GetSubframeWindow(cx: *mut JSContext, proxy: *mut JSObject, id: jsid) -> Option<Temporary<Window>> { +unsafe fn GetSubframeWindow(cx: *mut JSContext, proxy: HandleObject, id: HandleId) -> Option<Root<Window>> { let index = get_array_index_from_id(cx, id); if let Some(index) = index { - let target = GetProxyPrivate(proxy).to_object(); - let win: Root<Window> = native_from_reflector_jsmanaged(target).unwrap().root(); + let target = RootedObject::new(cx, GetProxyPrivate(*proxy.ptr).to_object()); + let win: Root<Window> = native_from_handleobject(target.handle()).unwrap(); let mut found = false; return win.r().IndexedGetter(index, &mut found); } @@ -118,132 +115,133 @@ unsafe fn GetSubframeWindow(cx: *mut JSContext, proxy: *mut JSObject, id: jsid) } #[allow(unsafe_code)] -unsafe extern fn getOwnPropertyDescriptor(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, - set: bool, desc: *mut JSPropertyDescriptor) -> bool { +unsafe extern fn getOwnPropertyDescriptor(cx: *mut JSContext, proxy: HandleObject, id: HandleId, + desc: MutableHandle<JSPropertyDescriptor>) -> u8 { let window = GetSubframeWindow(cx, proxy, id); if let Some(window) = window { - let window = window.root(); - (*desc).value = window.to_jsval(cx); - fill_property_descriptor(&mut *desc, proxy, true); - return true; + let mut val = RootedValue::new(cx, UndefinedValue()); + window.to_jsval(cx, val.handle_mut()); + (*desc.ptr).value = val.ptr; + fill_property_descriptor(&mut *desc.ptr, *proxy.ptr, true); + return JSTrue; } - let target = GetProxyPrivate(proxy).to_object(); - let flags = if set { JSRESOLVE_ASSIGNING } else { 0 } | JSRESOLVE_QUALIFIED; + let target = RootedObject::new(cx, GetProxyPrivate(*proxy.ptr).to_object()); // XXX This should be JS_GetOwnPropertyDescriptorById - if JS_GetPropertyDescriptorById(cx, target, id, flags, desc) == 0 { - return false; + if JS_GetPropertyDescriptorById(cx, target.handle(), id, desc) == 0 { + return JSFalse; } - if (*desc).obj != target { + if (*desc.ptr).obj != target.ptr { // Not an own property - (*desc).obj = ptr::null_mut(); + (*desc.ptr).obj = ptr::null_mut(); } else { - (*desc).obj = proxy; + (*desc.ptr).obj = *proxy.ptr; } - true + JSTrue } #[allow(unsafe_code)] -unsafe extern fn defineProperty(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, - desc: *mut JSPropertyDescriptor) -> bool { +unsafe extern fn defineProperty(cx: *mut JSContext, + proxy: HandleObject, + id: HandleId, + desc: Handle<JSPropertyDescriptor>, + res: *mut ObjectOpResult) -> u8 { if get_array_index_from_id(cx, id).is_some() { // Spec says to Reject whether this is a supported index or not, // since we have no indexed setter or indexed creator. That means // throwing in strict mode (FIXME: Bug 828137), doing nothing in // non-strict mode. - return true; + (*res).code_ = JSErrNum::JSMSG_CANT_DEFINE_WINDOW_ELEMENT as u32; + return JSTrue; } - let target = GetProxyPrivate(proxy).to_object(); - JS_DefinePropertyById(cx, target, id, (*desc).value, (*desc).getter, - (*desc).setter, (*desc).attrs) != 0 + let target = RootedObject::new(cx, GetProxyPrivate(*proxy.ptr).to_object()); + JS_DefinePropertyById6(cx, target.handle(), id, desc, res) } #[allow(unsafe_code)] -unsafe extern fn hasOwn(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, bp: *mut bool) -> bool { +unsafe extern fn hasOwn(cx: *mut JSContext, proxy: HandleObject, id: HandleId, bp: *mut u8) -> u8 { let window = GetSubframeWindow(cx, proxy, id); if window.is_some() { - *bp = true; - return true; + *bp = JSTrue; + return JSTrue; } - let target = GetProxyPrivate(proxy).to_object(); + let target = RootedObject::new(cx, GetProxyPrivate(*proxy.ptr).to_object()); let mut found = 0; - if JS_AlreadyHasOwnPropertyById(cx, target, id, &mut found) == 0 { - return false; + if JS_AlreadyHasOwnPropertyById(cx, target.handle(), id, &mut found) == 0 { + return JSFalse; } - *bp = found != 0; - return true; + *bp = (found != 0) as u8; + return JSTrue; } #[allow(unsafe_code)] -unsafe extern fn get(cx: *mut JSContext, proxy: *mut JSObject, receiver: *mut JSObject, id: jsid, - vp: *mut JSVal) -> bool { +unsafe extern fn get(cx: *mut JSContext, + proxy: HandleObject, + receiver: HandleObject, + id: HandleId, + vp: MutableHandleValue) -> u8 { let window = GetSubframeWindow(cx, proxy, id); if let Some(window) = window { - let window = window.root(); - *vp = window.to_jsval(cx); - return true; + window.to_jsval(cx, vp); + return JSTrue; } - let target = GetProxyPrivate(proxy).to_object(); - JS_ForwardGetPropertyTo(cx, target, id, receiver, vp) != 0 + let target = RootedObject::new(cx, GetProxyPrivate(*proxy.ptr).to_object()); + JS_ForwardGetPropertyTo(cx, target.handle(), id, receiver, vp) } #[allow(unsafe_code)] -unsafe extern fn set(cx: *mut JSContext, proxy: *mut JSObject, _receiver: *mut JSObject, - id: jsid, _strict: bool, vp: *mut JSVal) -> bool { +unsafe extern fn set(cx: *mut JSContext, + proxy: HandleObject, + receiver: HandleObject, + id: HandleId, + vp: MutableHandleValue, + res: *mut ObjectOpResult) -> u8 { if get_array_index_from_id(cx, id).is_some() { // Reject (which means throw if and only if strict) the set. - // FIXME: Throw - return true; + (*res).code_ = JSErrNum::JSMSG_READ_ONLY as u32; + return JSTrue; } - // FIXME: The receiver should be used, we need something like JS_ForwardSetPropertyTo. - let target = GetProxyPrivate(proxy).to_object(); - JS_SetPropertyById(cx, target, id, vp) != 0 + let target = RootedObject::new(cx, GetProxyPrivate(*proxy.ptr).to_object()); + let receiver = RootedValue::new(cx, ObjectValue(&**receiver.ptr)); + JS_ForwardSetPropertyTo(cx, target.handle(), id, HandleValue { ptr: vp.ptr }, receiver.handle(), res) } static PROXY_HANDLER: ProxyTraps = ProxyTraps { - getPropertyDescriptor: Some(get_property_descriptor - as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, - *mut JSPropertyDescriptor) -> bool), - getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor - as unsafe extern "C" fn(*mut JSContext, *mut JSObject, - jsid, bool, *mut JSPropertyDescriptor) - -> bool), - defineProperty: Some(defineProperty as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, - *mut JSPropertyDescriptor) -> bool), - getOwnPropertyNames: None, + enter: None, + getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor), + defineProperty: Some(defineProperty), + ownPropertyKeys: None, delete_: None, enumerate: None, - + preventExtensions: None, + isExtensible: None, has: None, - hasOwn: Some(hasOwn as unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool), - get: Some(get as unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, *mut JSVal) -> bool), - set: Some(set as unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, - jsid, bool, *mut JSVal) -> bool), - keys: None, - iterate: None, - + get: Some(get), + set: Some(set), call: None, construct: None, - nativeCall: 0 as *const u8, + getPropertyDescriptor: Some(get_property_descriptor), + hasOwn: Some(hasOwn), + getOwnEnumerablePropertyKeys: None, + nativeCall: None, hasInstance: None, - typeOf: None, objectClassIs: None, - obj_toString: None, + className: None, fun_toString: None, - //regexp_toShared: 0 as *u8, + boxedValue_unbox: None, defaultValue: None, - iteratorNext: None, + trace: None, finalize: None, - getElementIfPresent: None, - getPrototypeOf: None, - trace: None + objectMoved: None, + isCallable: None, + isConstructor: None, }; #[allow(unsafe_code)] |