aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/serviceworkerregistration.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-10-03 18:58:03 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-06 21:35:48 +0200
commitde846f25a65cf080ed8fc3bd201627872bd83f15 (patch)
tree989f35839d9d8ad4cdca6fbd5aa2df29622dbaf3 /components/script/dom/serviceworkerregistration.rs
parent83feb7dee32f602280ff6894c1b0a091698e29d4 (diff)
downloadservo-de846f25a65cf080ed8fc3bd201627872bd83f15.tar.gz
servo-de846f25a65cf080ed8fc3bd201627872bd83f15.zip
Make create_scope_things take a &GlobalScope
Diffstat (limited to 'components/script/dom/serviceworkerregistration.rs')
-rw-r--r--components/script/dom/serviceworkerregistration.rs12
1 files changed, 5 insertions, 7 deletions
diff --git a/components/script/dom/serviceworkerregistration.rs b/components/script/dom/serviceworkerregistration.rs
index e274e5a6e51..c3a08e514e4 100644
--- a/components/script/dom/serviceworkerregistration.rs
+++ b/components/script/dom/serviceworkerregistration.rs
@@ -4,7 +4,6 @@
use dom::bindings::codegen::Bindings::ServiceWorkerBinding::ServiceWorkerState;
use dom::bindings::codegen::Bindings::ServiceWorkerRegistrationBinding::{ServiceWorkerRegistrationMethods, Wrap};
-use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, Root};
use dom::bindings::reflector::reflect_dom_object;
use dom::bindings::str::USVString;
@@ -50,17 +49,16 @@ impl ServiceWorkerRegistration {
self.active.as_ref().unwrap()
}
- pub fn create_scope_things(global: GlobalRef, script_url: Url) -> ScopeThings {
- let global_scope = global.as_global_scope();
+ pub fn create_scope_things(global: &GlobalScope, script_url: Url) -> ScopeThings {
let worker_load_origin = WorkerScriptLoadOrigin {
referrer_url: None,
referrer_policy: None,
- pipeline_id: Some(global_scope.pipeline_id())
+ pipeline_id: Some(global.pipeline_id())
};
- let worker_id = global_scope.get_next_worker_id();
- let devtools_chan = global_scope.devtools_chan().cloned();
- let init = prepare_workerscope_init(global_scope, None);
+ let worker_id = global.get_next_worker_id();
+ let devtools_chan = global.devtools_chan().cloned();
+ let init = prepare_workerscope_init(global, None);
ScopeThings {
script_url: script_url,
init: init,