| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "web/WebSocketImpl.h" | 32 #include "web/WebSocketImpl.h" |
| 33 | 33 |
| 34 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" |
| 35 #include "core/frame/ConsoleTypes.h" | 35 #include "core/frame/ConsoleTypes.h" |
| 36 #include "modules/websockets/MainThreadWebSocketChannel.h" | |
| 37 #include "modules/websockets/NewWebSocketChannelImpl.h" | 36 #include "modules/websockets/NewWebSocketChannelImpl.h" |
| 38 #include "modules/websockets/WebSocketChannel.h" | 37 #include "modules/websockets/WebSocketChannel.h" |
| 39 #include "platform/RuntimeEnabledFeatures.h" | |
| 40 #include "public/platform/WebArrayBuffer.h" | 38 #include "public/platform/WebArrayBuffer.h" |
| 41 #include "public/platform/WebString.h" | 39 #include "public/platform/WebString.h" |
| 42 #include "public/platform/WebURL.h" | 40 #include "public/platform/WebURL.h" |
| 43 #include "public/web/WebDocument.h" | 41 #include "public/web/WebDocument.h" |
| 44 #include "web/WebSocketChannelClientProxy.h" | 42 #include "web/WebSocketChannelClientProxy.h" |
| 45 #include "wtf/ArrayBuffer.h" | 43 #include "wtf/ArrayBuffer.h" |
| 46 #include "wtf/text/CString.h" | 44 #include "wtf/text/CString.h" |
| 47 #include "wtf/text/WTFString.h" | 45 #include "wtf/text/WTFString.h" |
| 48 | 46 |
| 49 namespace blink { | 47 namespace blink { |
| 50 | 48 |
| 51 WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* clien
t) | 49 WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* clien
t) |
| 52 : m_client(client) | 50 : m_client(client) |
| 53 , m_channelProxy(WebSocketChannelClientProxy::create(this)) | 51 , m_channelProxy(WebSocketChannelClientProxy::create(this)) |
| 54 , m_binaryType(BinaryTypeBlob) | 52 , m_binaryType(BinaryTypeBlob) |
| 55 , m_isClosingOrClosed(false) | 53 , m_isClosingOrClosed(false) |
| 56 , m_bufferedAmount(0) | 54 , m_bufferedAmount(0) |
| 57 , m_bufferedAmountAfterClose(0) | 55 , m_bufferedAmountAfterClose(0) |
| 58 { | 56 { |
| 59 RefPtrWillBeRawPtr<Document> coreDocument = PassRefPtrWillBeRawPtr<Document>
(document); | 57 RefPtrWillBeRawPtr<Document> coreDocument = PassRefPtrWillBeRawPtr<Document>
(document); |
| 60 if (RuntimeEnabledFeatures::experimentalWebSocketEnabled()) { | 58 m_private = NewWebSocketChannelImpl::create(coreDocument.get(), m_channelPro
xy.get()); |
| 61 m_private = NewWebSocketChannelImpl::create(coreDocument.get(), m_channe
lProxy.get()); | |
| 62 } else { | |
| 63 m_private = MainThreadWebSocketChannel::create(coreDocument.get(), m_cha
nnelProxy.get()); | |
| 64 } | |
| 65 } | 59 } |
| 66 | 60 |
| 67 WebSocketImpl::~WebSocketImpl() | 61 WebSocketImpl::~WebSocketImpl() |
| 68 { | 62 { |
| 69 m_private->disconnect(); | 63 m_private->disconnect(); |
| 70 } | 64 } |
| 71 | 65 |
| 72 WebSocket::BinaryType WebSocketImpl::binaryType() const | 66 WebSocket::BinaryType WebSocketImpl::binaryType() const |
| 73 { | 67 { |
| 74 return m_binaryType; | 68 return m_binaryType; |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 void WebSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompletionS
tatus status, unsigned short code, const String& reason) | 196 void WebSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompletionS
tatus status, unsigned short code, const String& reason) |
| 203 { | 197 { |
| 204 m_isClosingOrClosed = true; | 198 m_isClosingOrClosed = true; |
| 205 m_client->didClose(static_cast<WebSocketClient::ClosingHandshakeCompletionSt
atus>(status), code, WebString(reason)); | 199 m_client->didClose(static_cast<WebSocketClient::ClosingHandshakeCompletionSt
atus>(status), code, WebString(reason)); |
| 206 | 200 |
| 207 // FIXME: Deprecate this call. | 201 // FIXME: Deprecate this call. |
| 208 m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cas
t<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(re
ason)); | 202 m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cas
t<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(re
ason)); |
| 209 } | 203 } |
| 210 | 204 |
| 211 } // namespace blink | 205 } // namespace blink |
| OLD | NEW |