diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-03 23:49:26 +0530 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-04 00:03:18 +0530 |
commit | ccbd38e2c740464184e4c12c24d4b760ed4ac817 (patch) | |
tree | aaf552d1807f3045d5c273f161f5ddd7eca40f16 /components/script/dom/websocket.rs | |
parent | f605c6aa69e34fcd5734350759969bfac2098952 (diff) | |
download | servo-ccbd38e2c740464184e4c12c24d4b760ed4ac817.tar.gz servo-ccbd38e2c740464184e4c12c24d4b760ed4ac817.zip |
Make websockets not crash in a worker scope
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r-- | components/script/dom/websocket.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index c9658a1b5c2..c8544698ecb 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -8,7 +8,6 @@ use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods; use dom::bindings::codegen::Bindings::WebSocketBinding; use dom::bindings::codegen::Bindings::WebSocketBinding::{BinaryType, WebSocketMethods}; -use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::UnionTypes::StringOrStringSequence::{self, eString, eStringSequence}; use dom::bindings::conversions::{ToJSValConvertible}; use dom::bindings::error::{Error, Fallible}; @@ -24,6 +23,7 @@ use dom::closeevent::CloseEvent; use dom::event::{Event, EventBubbles, EventCancelable}; use dom::eventtarget::EventTarget; use dom::messageevent::MessageEvent; +use dom::urlhelper::UrlHelper; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use js::jsapi::{JSAutoCompartment, JSAutoRequest, RootedValue}; use js::jsapi::{JS_GetArrayBufferData, JS_NewArrayBuffer}; @@ -233,7 +233,7 @@ impl WebSocket { } // Step 6: Origin. - let origin = global.as_window().Location().Origin().0; + let origin = UrlHelper::Origin(&global.get_url()).0; // Step 7. let ws = WebSocket::new(global, resource_url.clone()); |