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

Auto merge of #13572 - nox:cleanup-global, r=jdm

Browse source 
Clean up some global things

<!-- 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/13572)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-04 17:19:11 -05:00 • committed by GitHub
commit 136c9a89b9
5 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/script/dom/bindings/global.rs
View file

@ -125,12 +125,7 @@ impl<'a> GlobalRef<'a> {
/// Get the `ResourceThreads` for this global scope.
pub fn resource_threads(&self) -> ResourceThreads {
match *self {
GlobalRef::Window(ref window) => {
let doc = window.Document();
let doc = doc.r();
let loader = doc.loader();
loader.resource_threads().clone()
}
GlobalRef::Window(ref window) => window.resource_threads().clone(),
GlobalRef::Worker(ref worker) => worker.resource_threads().clone(),
}
}
@ -140,14 +135,6 @@ impl<'a> GlobalRef<'a> {
self.resource_threads().sender()
}
/// Get the worker's id.
pub fn get_worker_id(&self) -> Option<WorkerId> {
match *self {
GlobalRef::Window(_) => None,
GlobalRef::Worker(ref worker) => Some(worker.get_worker_id()),
}
}
/// Get next worker id.
pub fn get_next_worker_id(&self) -> WorkerId {
match *self {