Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6510 - mintern:fix-worker-redirect-location, r=Ms2ger

Browse source 
Update Worker location for redirects

Fixes #4146

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6510)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-02 03:28:29 -06:00
commit be9d60664d
5 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -149,15 +149,16 @@ impl DedicatedWorkerGlobalScope {
parent_sender: Box<ScriptChan+Send>, parent_sender: Box<ScriptChan+Send>,
own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>, own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
receiver: Receiver<(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); task_state::initialize(SCRIPT | IN_WORKER);
let roots = RootCollection::new(); let roots = RootCollection::new();
let _stack_roots_tls = StackRootTLS::new(&roots); 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(_) => { Err(_) => {
println!("error loading script {}", worker_url.serialize()); println!("error loading script {}", serialized_worker_url);
parent_sender.send(ScriptMsg::RunnableMsg( parent_sender.send(ScriptMsg::RunnableMsg(
box WorkerEventHandler::new(worker))).unwrap(); box WorkerEventHandler::new(worker))).unwrap();
return; return;
@ -168,15 +169,16 @@ impl DedicatedWorkerGlobalScope {
}; };
let runtime = Rc::new(ScriptTask::new_rt_and_cx()); let runtime = Rc::new(ScriptTask::new_rt_and_cx());
let serialized_url = url.serialize();
let global = DedicatedWorkerGlobalScope::new( 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); parent_sender, own_sender, receiver);
{ {
let _ar = AutoWorkerReset::new(global.r(), worker); let _ar = AutoWorkerReset::new(global.r(), worker);
match runtime.evaluate_script( match runtime.evaluate_script(
global.r().reflector().get_jsobject(), source, url.serialize(), 1) { global.r().reflector().get_jsobject(), source, serialized_url, 1) {
Ok(_) => (), Ok(_) => (),
Err(_) => { Err(_) => {
// TODO: An error needs to be dispatched to the parent. // TODO: An error needs to be dispatched to the parent.

5
tests/wpt/metadata/workers/baseurl/alpha/importScripts.html.ini
View file

@ -1,5 +0,0 @@
[importScripts.html]
type: testharness
[Base URL in workers: importScripts]
expected: FAIL

5
tests/wpt/metadata/workers/baseurl/alpha/worker.html.ini
View file

@ -1,5 +0,0 @@
[worker.html]
type: testharness
[Base URL in workers: new Worker()]
expected: FAIL

5
tests/wpt/metadata/workers/baseurl/alpha/xhr.html.ini
View file

@ -1,5 +0,0 @@
[xhr.html]
type: testharness
[Base URL in workers: XHR]
expected: FAIL

5
tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini
View file

@ -1,5 +0,0 @@
[redirect.html]
type: testharness
[location with a worker in separate file that redirects]
expected: FAIL