Skip to content

Commit

Permalink
Update Worker location for redirects
Browse files Browse the repository at this point in the history
Fixes #4146
  • Loading branch information
mintern committed Jul 2, 2015
1 parent fc1e427 commit 0a3981c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 25 deletions.
12 changes: 7 additions & 5 deletions components/script/dom/dedicatedworkerglobalscope.rs
Expand Up @@ -150,15 +150,16 @@ impl DedicatedWorkerGlobalScope {
parent_sender: Box<ScriptChan+Send>,
own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>) {
spawn_named(format!("WebWorker for {}", worker_url.serialize()), move || {
let serialized_worker_url = worker_url.serialize();
spawn_named(format!("WebWorker for {}", serialized_worker_url), move || {
task_state::initialize(SCRIPT | IN_WORKER);

let roots = RootCollection::new();
let _stack_roots_tls = StackRootTLS::new(&roots);

let (url, source) = match load_whole_resource(&resource_task, worker_url.clone()) {
let (url, source) = match load_whole_resource(&resource_task, worker_url) {
Err(_) => {
println!("error loading script {}", worker_url.serialize());
println!("error loading script {}", serialized_worker_url);
parent_sender.send(ScriptMsg::RunnableMsg(
box WorkerEventHandler::new(worker))).unwrap();
return;
Expand All @@ -169,15 +170,16 @@ impl DedicatedWorkerGlobalScope {
};

let runtime = Rc::new(ScriptTask::new_rt_and_cx());
let serialized_url = url.serialize();
let global = DedicatedWorkerGlobalScope::new(
worker_url, id, devtools_chan, runtime.clone(), resource_task,
url, id, devtools_chan, runtime.clone(), resource_task,
parent_sender, own_sender, receiver);

{
let _ar = AutoWorkerReset::new(global.r(), worker);

match runtime.evaluate_script(
global.r().reflector().get_jsobject(), source, url.serialize(), 1) {
global.r().reflector().get_jsobject(), source, serialized_url, 1) {
Ok(_) => (),
Err(_) => {
// TODO: An error needs to be dispatched to the parent.
Expand Down

This file was deleted.

5 changes: 0 additions & 5 deletions tests/wpt/metadata/workers/baseurl/alpha/worker.html.ini

This file was deleted.

5 changes: 0 additions & 5 deletions tests/wpt/metadata/workers/baseurl/alpha/xhr.html.ini

This file was deleted.

This file was deleted.

0 comments on commit 0a3981c

Please sign in to comment.