aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/callback.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2014-09-29 06:55:40 +0530
committerManish Goregaokar <manishsmail@gmail.com>2014-10-05 22:53:52 +0530
commitdcbb941300805aef02f95aeea5c89f7f0f163768 (patch)
treedc8eddcd6aa4f318618917c638bcf8c7ac42d5af /components/script/dom/bindings/callback.rs
parent707a2870fa5a7c10dad49a8ab0db39c7e568f1c6 (diff)
downloadservo-dcbb941300805aef02f95aeea5c89f7f0f163768.tar.gz
servo-dcbb941300805aef02f95aeea5c89f7f0f163768.zip
Remove Traceable from callback.rs
Diffstat (limited to 'components/script/dom/bindings/callback.rs')
-rw-r--r--components/script/dom/bindings/callback.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
index d450dd25688..9b8dfb30718 100644
--- a/components/script/dom/bindings/callback.rs
+++ b/components/script/dom/bindings/callback.rs
@@ -6,7 +6,6 @@
use dom::bindings::global::global_object_for_js_object;
use dom::bindings::js::JSRef;
-use dom::bindings::trace::Traceable;
use dom::bindings::utils::Reflectable;
use js::jsapi::{JSContext, JSObject, JS_WrapObject, JS_ObjectIsCallable};
use js::jsapi::JS_GetProperty;
@@ -37,7 +36,7 @@ impl CallbackFunction {
pub fn new(callback: *mut JSObject) -> CallbackFunction {
CallbackFunction {
object: CallbackObject {
- callback: Traceable::new(callback)
+ callback: callback
}
}
}
@@ -57,7 +56,7 @@ pub struct CallbackInterface {
#[jstraceable]
struct CallbackObject {
/// The underlying `JSObject`.
- callback: Traceable<*mut JSObject>,
+ callback: *mut JSObject,
}
/// A trait to be implemented by concrete IDL callback function and
@@ -72,14 +71,14 @@ pub trait CallbackContainer {
impl CallbackInterface {
/// Returns the underlying `JSObject`.
pub fn callback(&self) -> *mut JSObject {
- *self.object.callback
+ self.object.callback
}
}
impl CallbackFunction {
/// Returns the underlying `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 {
CallbackInterface {
object: CallbackObject {
- callback: Traceable::new(callback)
+ callback: callback
}
}
}