Auto merge of #9521 - Manishearth:ws-worker, r=Ms2ger

Make websockets work in a worker scope

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9521)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-05 08:21:37 +05:30
commit b35801bf29
4 changed files with 34 additions and 4 deletions

View file

@ -33717,7 +33717,16 @@
},
"local_changes": {
"deleted": [],
"items": {},
"items": {
"testharness": {
"websockets/Send-data.worker.js": [
{
"path": "websockets/Send-data.worker.js",
"url": "/websockets/Send-data.worker"
}
]
}
},
"reftest_nodes": {}
},
"reftest_nodes": {

View file

@ -0,0 +1,21 @@
importScripts("/resources/testharness.js");
importScripts('websocket.js?pipe=sub')
var data = "test data";
async_test(function(t) {
var wsocket = CreateWebSocket(false, false, false);
wsocket.addEventListener('open', function (e) {
wsocket.send(data)
}, true)
wsocket.addEventListener('message', t.step_func_done(function(e) {
assert_equals(e.data, data);
done();
}), true);
}, "W3C WebSocket API - Send data on a WebSocket in a Worker")

View file

@ -25,7 +25,7 @@ var closeCode;
var urlToOpen;
function IsWebSocket() {
if (!window.WebSocket) {
if (!self.WebSocket) {
assert_true(false, "Browser does not support WebSocket");
}
}