mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Remove Traceable from browsercontext.rs
This commit is contained in:
parent
b908d5accb
commit
8de00ab999
2 changed files with 7 additions and 8 deletions
|
@ -180,9 +180,9 @@ impl<T: JSTraceable+Copy> JSTraceable for Cell<T> {
|
|||
}
|
||||
}
|
||||
|
||||
impl JSTraceable for Traceable<*mut JSObject> {
|
||||
impl JSTraceable for *mut JSObject {
|
||||
fn trace(&self, trc: *mut JSTracer) {
|
||||
trace_object(trc, "object", **self);
|
||||
trace_object(trc, "object", *self);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::bindings::js::{JS, JSRef, Temporary};
|
||||
use dom::bindings::trace::Traceable;
|
||||
use dom::bindings::utils::Reflectable;
|
||||
use dom::document::Document;
|
||||
use dom::window::Window;
|
||||
|
@ -20,7 +19,7 @@ use std::ptr;
|
|||
pub struct BrowserContext {
|
||||
history: Vec<SessionHistoryEntry>,
|
||||
active_index: uint,
|
||||
window_proxy: Traceable<*mut JSObject>,
|
||||
window_proxy: *mut JSObject,
|
||||
}
|
||||
|
||||
impl BrowserContext {
|
||||
|
@ -28,7 +27,7 @@ impl BrowserContext {
|
|||
let mut context = BrowserContext {
|
||||
history: vec!(SessionHistoryEntry::new(document)),
|
||||
active_index: 0,
|
||||
window_proxy: Traceable::new(ptr::null_mut()),
|
||||
window_proxy: ptr::null_mut(),
|
||||
};
|
||||
context.create_window_proxy();
|
||||
context
|
||||
|
@ -44,8 +43,8 @@ impl BrowserContext {
|
|||
}
|
||||
|
||||
pub fn window_proxy(&self) -> *mut JSObject {
|
||||
assert!(self.window_proxy.deref().is_not_null());
|
||||
*self.window_proxy
|
||||
assert!(self.window_proxy.is_not_null());
|
||||
self.window_proxy
|
||||
}
|
||||
|
||||
fn create_window_proxy(&mut self) {
|
||||
|
@ -62,7 +61,7 @@ impl BrowserContext {
|
|||
WrapperNew(cx, parent, *handler.deref())
|
||||
});
|
||||
assert!(wrapper.is_not_null());
|
||||
self.window_proxy = Traceable::new(wrapper);
|
||||
self.window_proxy = wrapper;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue