diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-22 07:08:41 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-22 07:08:41 -0500 |
commit | 886805d76c206214047c475c6f8947c8c38c40b7 (patch) | |
tree | 590cb90eb09bd8600719c144a8a59da25592f597 /components/script/dom/dedicatedworkerglobalscope.rs | |
parent | 3a1bf45dea2ee7a9f4d8f299a2f1d05912b5e0a7 (diff) | |
parent | 04b532e1fbb46b8761d0e47e6f5916046d9db488 (diff) | |
download | servo-886805d76c206214047c475c6f8947c8c38c40b7.tar.gz servo-886805d76c206214047c475c6f8947c8c38c40b7.zip |
Auto merge of #5790 - Ms2ger:new_rt_and_cx, r=jdm
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5790)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/dedicatedworkerglobalscope.rs')
-rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 8ab0621e0f9..debc435c05d 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -167,15 +167,15 @@ impl DedicatedWorkerGlobalScope { } }; - let (_js_runtime, js_context) = ScriptTask::new_rt_and_cx(); + let runtime = ScriptTask::new_rt_and_cx(); let global = DedicatedWorkerGlobalScope::new( - worker_url, id, devtools_chan, js_context.clone(), resource_task, + worker_url, id, devtools_chan, runtime.cx.clone(), resource_task, parent_sender, own_sender, receiver).root(); { let _ar = AutoWorkerReset::new(global.r(), worker); - match js_context.evaluate_script( + match runtime.cx.evaluate_script( global.r().reflector().get_jsobject(), source, url.serialize(), 1) { Ok(_) => (), Err(_) => println!("evaluate_script failed") |