diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-21 12:09:56 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-21 12:09:56 -0700 |
commit | ad328fda65e6b7180de8b47f0964fe2f94c505a9 (patch) | |
tree | b210abf2ce36dbc797010ddc57a437f1499a8a77 /components/script/script_task.rs | |
parent | 8df0ee2bb5d40e4b22db1666982e2e5ea36513f6 (diff) | |
parent | 7d1b567744747450c6e27172f088a451a6d87544 (diff) | |
download | servo-ad328fda65e6b7180de8b47f0964fe2f94c505a9.tar.gz servo-ad328fda65e6b7180de8b47f0964fe2f94c505a9.zip |
auto merge of #4705 : Ms2ger/servo/refcounted, r=larsbergstrom
This will allow us to make them Send in the future.
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r-- | components/script/script_task.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index d75f1f06c9e..64ffedda065 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -18,7 +18,7 @@ use dom::bindings::conversions::StringificationBehavior; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable}; use dom::bindings::js::{RootCollection, RootCollectionPtr}; -use dom::bindings::refcounted::{LiveDOMReferences, Trusted}; +use dom::bindings::refcounted::{LiveDOMReferences, Trusted, TrustedReference}; use dom::bindings::structuredclone::StructuredCloneData; use dom::bindings::trace::JSTraceable; use dom::bindings::utils::{wrap_for_same_compartment, pre_wrap}; @@ -77,7 +77,6 @@ use js::rust::{Cx, RtUtils}; use js; use url::Url; -use libc; use std::any::{Any, AnyRefExt}; use std::borrow::ToOwned; use std::cell::Cell; @@ -125,7 +124,7 @@ pub enum ScriptMsg { /// Generic message that encapsulates event handling. RunnableMsg(Box<Runnable+Send>), /// A DOM object's last pinned reference was removed (dispatched to all tasks). - RefcountCleanup(*const libc::c_void), + RefcountCleanup(TrustedReference), } /// A cloneable interface for communicating with an event loop. |