servo: Merge #13106 - Remove mutex from Trusted (from servo:trusted); r=nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 9e726b4d83fc169c38f176b9958cfb1b66363e8f
This commit is contained in:
Alan Jeffrey
2016-08-29 05:00:39 -05:00
parent ce75209054
commit 4e5cb0a7ec
5 changed files with 54 additions and 91 deletions

View File

@@ -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) =>