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

Remove Traceable from callback.rs

Browse source
This commit is contained in:
Manish Goregaokar 2014-09-29 06:55:40 +05:30
parent 707a2870fa
commit dcbb941300
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/bindings/callback.rs
View file

@ -6,7 +6,6 @@
use dom::bindings::global::global_object_for_js_object; use dom::bindings::global::global_object_for_js_object;
use dom::bindings::js::JSRef; use dom::bindings::js::JSRef;
use dom::bindings::trace::Traceable;
use dom::bindings::utils::Reflectable; use dom::bindings::utils::Reflectable;
use js::jsapi::{JSContext, JSObject, JS_WrapObject, JS_ObjectIsCallable}; use js::jsapi::{JSContext, JSObject, JS_WrapObject, JS_ObjectIsCallable};
use js::jsapi::JS_GetProperty; use js::jsapi::JS_GetProperty;
@ -37,7 +36,7 @@ impl CallbackFunction {
pub fn new(callback: *mut JSObject) -> CallbackFunction { pub fn new(callback: *mut JSObject) -> CallbackFunction {
CallbackFunction { CallbackFunction {
object: CallbackObject { object: CallbackObject {
callback: Traceable::new(callback) callback: callback
} }
} }
} }
@ -57,7 +56,7 @@ pub struct CallbackInterface {
#[jstraceable] #[jstraceable]
struct CallbackObject { struct CallbackObject {
/// The underlying `JSObject`. /// The underlying `JSObject`.
callback: Traceable<*mut JSObject>, callback: *mut JSObject,
} }
/// A trait to be implemented by concrete IDL callback function and /// A trait to be implemented by concrete IDL callback function and
@ -72,14 +71,14 @@ pub trait CallbackContainer {
impl CallbackInterface { impl CallbackInterface {
/// Returns the underlying `JSObject`. /// Returns the underlying `JSObject`.
pub fn callback(&self) -> *mut JSObject { pub fn callback(&self) -> *mut JSObject {
*self.object.callback self.object.callback
} }
} }
impl CallbackFunction { impl CallbackFunction {
/// Returns the underlying `JSObject`. /// Returns the underlying `JSObject`.
pub fn callback(&self) -> *mut JSObject { pub fn callback(&self) -> *mut JSObject {
*self.object.callback self.object.callback
} }
} }
@ -88,7 +87,7 @@ impl CallbackInterface {
pub fn new(callback: *mut JSObject) -> CallbackInterface { pub fn new(callback: *mut JSObject) -> CallbackInterface {
CallbackInterface { CallbackInterface {
object: CallbackObject { object: CallbackObject {
callback: Traceable::new(callback) callback: callback
} }
} }
} }