diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-01-17 15:57:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-17 15:57:30 -0500 |
commit | fb95f9df9cab44afd66eae809af164637bd8f00a (patch) | |
tree | 45ab882b624d2ae2d3fdb017405b3f74989de683 /components/script/dom/dedicatedworkerglobalscope.rs | |
parent | 866fd55ded6ded98b49862a29951d746a7846f64 (diff) | |
parent | 367014a4ea5b3fff5e4f33df199db0fdb7a95925 (diff) | |
download | servo-fb95f9df9cab44afd66eae809af164637bd8f00a.tar.gz servo-fb95f9df9cab44afd66eae809af164637bd8f00a.zip |
Auto merge of #22353 - jdm:runtime-parent, r=nox
Update rust-mozjs
These changes adjust our uses of the rust-mozjs APIs to accommodate the changes in https://github.com/servo/rust-mozjs/pull/450.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22342.
- [x] There are tests for these changes
<!-- 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/22353)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/dedicatedworkerglobalscope.rs')
-rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 92e26bad353..00fcd388bf3 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -23,7 +23,7 @@ use crate::dom::messageevent::MessageEvent; use crate::dom::worker::{TrustedWorkerAddress, Worker}; use crate::dom::workerglobalscope::WorkerGlobalScope; use crate::script_runtime::ScriptThreadEventCategory::WorkerEvent; -use crate::script_runtime::{new_rt_and_cx, CommonScriptMsg, Runtime, ScriptChan, ScriptPort}; +use crate::script_runtime::{new_child_runtime, CommonScriptMsg, Runtime, ScriptChan, ScriptPort}; use crate::task_queue::{QueuedTask, QueuedTaskConversion, TaskQueue}; use crate::task_source::TaskSourceName; use crossbeam_channel::{unbounded, Receiver, Sender}; @@ -272,11 +272,9 @@ impl DedicatedWorkerGlobalScope { let serialized_worker_url = worker_url.to_string(); let name = format!("WebWorker for {}", serialized_worker_url); let top_level_browsing_context_id = TopLevelBrowsingContextId::installed(); - let origin = GlobalScope::current() - .expect("No current global object") - .origin() - .immutable() - .clone(); + let current_global = GlobalScope::current().expect("No current global object"); + let origin = current_global.origin().immutable().clone(); + let parent = current_global.runtime_handle(); thread::Builder::new() .name(name) @@ -327,7 +325,7 @@ impl DedicatedWorkerGlobalScope { let url = metadata.final_url; let source = String::from_utf8_lossy(&bytes); - let runtime = unsafe { new_rt_and_cx() }; + let runtime = unsafe { new_child_runtime(parent) }; let (devtools_mpsc_chan, devtools_mpsc_port) = unbounded(); ROUTER.route_ipc_receiver_to_crossbeam_sender( |