diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-29 05:00:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 05:00:39 -0500 |
| commit | 9e726b4d83fc169c38f176b9958cfb1b66363e8f (patch) | |
| tree | 13212cf566b6e3c3d80a101ad99ca083fb39b288 /components/script/script_thread.rs | |
| parent | d37d4d697ae8c8897384213be82f25a51a4aa835 (diff) | |
| parent | 6a271b05277b1c60c3aefa69474e75a662b402a3 (diff) | |
| download | servo-9e726b4d83fc169c38f176b9958cfb1b66363e8f.tar.gz servo-9e726b4d83fc169c38f176b9958cfb1b66363e8f.zip | |
Auto merge of #13106 - servo:trusted, r=nox
Remove mutex from Trusted
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13106)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 5dcf965aaa5..ac6165d5c4f 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -31,7 +31,7 @@ use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection}; use dom::bindings::js::{RootCollectionPtr, RootedReference}; -use dom::bindings::refcounted::{LiveDOMReferences, Trusted}; +use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::Reflectable; use dom::bindings::str::DOMString; use dom::bindings::trace::JSTraceable; @@ -948,8 +948,6 @@ impl ScriptThread { runnable.handler() } } - MainThreadScriptMsg::Common(CommonScriptMsg::RefcountCleanup(addr)) => - LiveDOMReferences::cleanup(addr), MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(reports_chan)) => self.collect_reports(reports_chan), MainThreadScriptMsg::DOMManipulation(task) => |