aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Yeung <kungfukeith11@gmail.com>2015-05-18 00:35:23 +0800
committerKeith Yeung <kungfukeith11@gmail.com>2015-05-18 00:35:23 +0800
commitea2bc0023bb239c0bfd5a3343bfee9f6f632cbc3 (patch)
treed2916f75c07f8c5d7c36d77e42d1a0768000a6c1
parentf15f4a5f47710e76268fa83faee1078272060d22 (diff)
downloadservo-ea2bc0023bb239c0bfd5a3343bfee9f6f632cbc3.tar.gz
servo-ea2bc0023bb239c0bfd5a3343bfee9f6f632cbc3.zip
Made open event in WebScoket not cancelable (fixes #6101)
-rw-r--r--components/script/dom/websocket.rs2
-rw-r--r--tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini3
2 files changed, 1 insertions, 4 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 009ca43a78b..75c868b50db 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -247,7 +247,7 @@ impl WebSocketTaskHandler {
let event = Event::new(global.r(),
"open".to_owned(),
EventBubbles::DoesNotBubble,
- EventCancelable::Cancelable).root();
+ EventCancelable::NotCancelable).root();
let target: JSRef<EventTarget> = EventTargetCast::from_ref(ws);
event.r().fire(target);
}
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
index 94e107e3f53..1f833c38a68 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
@@ -1,9 +1,6 @@
[018.html]
type: testharness
expected: TIMEOUT
- [open event]
- expected: FAIL
-
[message event]
expected: TIMEOUT