Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove deref_mut from Untraceable/Traceable (fixes #2736)

Browse source
This commit is contained in:
Manish Goregaokar 2014-07-01 00:59:52 +05:30
parent f3b9c11f7a
commit 7cc8e2eb57
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1757,7 +1757,8 @@ def CreateBindingJSObject(descriptor, parent=None):
assert not descriptor.createGlobal assert not descriptor.createGlobal
create += """ create += """
let js_info = aScope.deref().page().js_info(); let js_info = aScope.deref().page().js_info();
let handler = js_info.get_ref().dom_static.proxy_handlers.deref().get(&(PrototypeList::id::%s as uint)); let mut handlers = js_info.get_ref().dom_static.proxy_handlers.deref().borrow_mut();
let handler = handlers.get(&(PrototypeList::id::%s as uint));
let mut private = PrivateValue(squirrel_away_unique(aObject) as *libc::c_void); let mut private = PrivateValue(squirrel_away_unique(aObject) as *libc::c_void);
let obj = with_compartment(aCx, proto, || { let obj = with_compartment(aCx, proto, || {
NewProxyObject(aCx, *handler, NewProxyObject(aCx, *handler,
@ -2080,7 +2081,8 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
getPrototypeOf: None, getPrototypeOf: None,
trace: Some(%s) trace: Some(%s)
}; };
js_info.dom_static.proxy_handlers.insert(PrototypeList::id::%s as uint, let mut handlers = js_info.dom_static.proxy_handlers.deref().borrow_mut();
handlers.insert(PrototypeList::id::%s as uint,
CreateProxyHandler(&traps, &Class as *_ as *_)); CreateProxyHandler(&traps, &Class as *_ as *_));
""" % (FINALIZE_HOOK_NAME, """ % (FINALIZE_HOOK_NAME,

12
src/components/script/dom/bindings/trace.rs
View file

@ -104,12 +104,6 @@ impl<T> Deref<T> for Untraceable<T> {
} }
} }
impl<T> DerefMut<T> for Untraceable<T> {
fn deref_mut<'a>(&'a mut self) -> &'a mut T {
&mut self.inner
}
}
/// Encapsulates a type that can be traced but is boxed in a type we don't control /// Encapsulates a type that can be traced but is boxed in a type we don't control
/// (such as RefCell). Wrap a field in Traceable and implement the Encodable trait /// (such as RefCell). Wrap a field in Traceable and implement the Encodable trait
/// for that new concrete type to achieve magic compiler-derived trace hooks. /// for that new concrete type to achieve magic compiler-derived trace hooks.
@ -135,12 +129,6 @@ impl<T> Deref<T> for Traceable<T> {
} }
} }
impl<T> DerefMut<T> for Traceable<T> {
fn deref_mut<'a>(&'a mut self) -> &'a mut T {
&mut self.inner
}
}
impl<S: Encoder<E>, E, T: Encodable<S, E>> Encodable<S, E> for Traceable<RefCell<T>> { impl<S: Encoder<E>, E, T: Encodable<S, E>> Encodable<S, E> for Traceable<RefCell<T>> {
fn encode(&self, s: &mut S) -> Result<(), E> { fn encode(&self, s: &mut S) -> Result<(), E> {
self.borrow().encode(s) self.borrow().encode(s)

6
src/components/script/dom/bindings/utils.rs
View file

@ -14,7 +14,7 @@ use servo_util::str::DOMString;
use std::collections::hashmap::HashMap; use std::collections::hashmap::HashMap;
use libc; use libc;
use libc::c_uint; use libc::c_uint;
use std::cell::Cell; use std::cell::{Cell, RefCell};
use std::mem; use std::mem;
use std::cmp::PartialEq; use std::cmp::PartialEq;
use std::ptr; use std::ptr;
@ -52,13 +52,13 @@ use js;
#[allow(raw_pointer_deriving)] #[allow(raw_pointer_deriving)]
#[deriving(Encodable)] #[deriving(Encodable)]
pub struct GlobalStaticData { pub struct GlobalStaticData {
pub proxy_handlers: Untraceable<HashMap<uint, *libc::c_void>>, pub proxy_handlers: Untraceable<RefCell<HashMap<uint, *libc::c_void>>>,
pub windowproxy_handler: Untraceable<*libc::c_void>, pub windowproxy_handler: Untraceable<*libc::c_void>,
} }
pub fn GlobalStaticData() -> GlobalStaticData { pub fn GlobalStaticData() -> GlobalStaticData {
GlobalStaticData { GlobalStaticData {
proxy_handlers: Untraceable::new(HashMap::new()), proxy_handlers: Untraceable::new(RefCell::new(HashMap::new())),
windowproxy_handler: Untraceable::new(browsercontext::new_window_proxy_handler()), windowproxy_handler: Untraceable::new(browsercontext::new_window_proxy_handler()),
} }
} }