Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10833 - zubron:use-document-base-url-worker-10577, r=Ms2ger

Browse source 
Use the document base url when resolving worker URLs

This fixes #10577.

I'm not sure if the `worker.js` file needed by this test is in the right location. I placed it within `tests/wpt/web-platform-tests/workers/constructors/Worker/sample_worker/` but thought it could also be placed in `tests/wpt/web-platform-tests/resources/`. Let me know if I should change its location. Thanks! :)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10833)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-25 12:03:10 -07:00
commit ec9e1fe7e6
4 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/worker.rs
View file

@ -69,7 +69,7 @@ impl Worker {
// https://html.spec.whatwg.org/multipage/#dom-worker
pub fn Constructor(global: GlobalRef, script_url: DOMString) -> Fallible<Root<Worker>> {
// Step 2-4.
let worker_url = match global.get_url().join(&script_url) {
let worker_url = match global.api_base_url().join(&script_url) {
Ok(url) => url,
Err(_) => return Err(Error::Syntax),
};

6
tests/wpt/metadata/MANIFEST.json
View file

@ -35241,6 +35241,12 @@
"path": "dom/nodes/Node-isSameNode.html",
"url": "/dom/nodes/Node-isSameNode.html"
}
],
"workers/constructors/Worker/use-base-url.html": [
{
"path": "workers/constructors/Worker/use-base-url.html",
"url": "/workers/constructors/Worker/use-base-url.html"
}
]
}
},

1
tests/wpt/web-platform-tests/workers/constructors/Worker/sample_worker/worker.js Normal file
View file

@ -0,0 +1 @@
onmessage = function(event) { postMessage(event.data); }

18
tests/wpt/web-platform-tests/workers/constructors/Worker/use-base-url.html Normal file
View file

@ -0,0 +1,18 @@
<!doctype html>
<meta charset="utf-8">
<title>Use the document base url when resolving worker URLs</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<base href="/workers/constructors/Worker/sample_worker/">
<script>
async_test(function(t) {
var worker = new Worker('worker.js');
var data = "foo";
worker.postMessage(data);
worker.onmessage = t.step_func_done(function(event) {
assert_equals(event.data, data, "event.data does not match expected data");
});
worker.onerror = t.unreached_func("received error event");
}, "Use the document base url when resolving worker URLs");
</script>