| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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 "WebSocketImpl.h" | 32 #include "WebSocketImpl.h" |
| 33 | 33 |
| 34 #include "RuntimeEnabledFeatures.h" |
| 34 #include "WebArrayBuffer.h" | 35 #include "WebArrayBuffer.h" |
| 35 #include "WebDocument.h" | 36 #include "WebDocument.h" |
| 36 #include "WebSocketClient.h" | 37 #include "WebSocketClient.h" |
| 37 #include "core/dom/Document.h" | 38 #include "core/dom/Document.h" |
| 38 #include "RuntimeEnabledFeatures.h" | 39 #include "core/page/ConsoleTypes.h" |
| 39 #include "core/platform/KURL.h" | 40 #include "core/platform/KURL.h" |
| 40 #include "modules/websockets/MainThreadWebSocketChannel.h" | 41 #include "modules/websockets/MainThreadWebSocketChannel.h" |
| 41 #include "modules/websockets/WebSocketChannel.h" | 42 #include "modules/websockets/WebSocketChannel.h" |
| 42 #include "modules/websockets/WebSocketChannelClient.h" | 43 #include "modules/websockets/WebSocketChannelClient.h" |
| 43 | 44 |
| 44 #include <public/WebString.h> | 45 #include <public/WebString.h> |
| 45 #include <public/WebURL.h> | 46 #include <public/WebURL.h> |
| 46 #include <wtf/ArrayBuffer.h> | 47 #include <wtf/ArrayBuffer.h> |
| 47 | 48 |
| 48 using namespace WebCore; | 49 using namespace WebCore; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 return m_private->bufferedAmount(); | 109 return m_private->bufferedAmount(); |
| 109 } | 110 } |
| 110 | 111 |
| 111 void WebSocketImpl::close(int code, const WebString& reason) | 112 void WebSocketImpl::close(int code, const WebString& reason) |
| 112 { | 113 { |
| 113 m_private->close(code, reason); | 114 m_private->close(code, reason); |
| 114 } | 115 } |
| 115 | 116 |
| 116 void WebSocketImpl::fail(const WebString& reason) | 117 void WebSocketImpl::fail(const WebString& reason) |
| 117 { | 118 { |
| 118 m_private->fail(reason); | 119 m_private->fail(reason, ErrorMessageLevel); |
| 119 } | 120 } |
| 120 | 121 |
| 121 void WebSocketImpl::disconnect() | 122 void WebSocketImpl::disconnect() |
| 122 { | 123 { |
| 123 m_private->disconnect(); | 124 m_private->disconnect(); |
| 124 m_client = 0; | 125 m_client = 0; |
| 125 } | 126 } |
| 126 | 127 |
| 127 void WebSocketImpl::didConnect() | 128 void WebSocketImpl::didConnect() |
| 128 { | 129 { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 { | 161 { |
| 161 m_client->didStartClosingHandshake(); | 162 m_client->didStartClosingHandshake(); |
| 162 } | 163 } |
| 163 | 164 |
| 164 void WebSocketImpl::didClose(unsigned long bufferedAmount, ClosingHandshakeCompl
etionStatus status, unsigned short code, const String& reason) | 165 void WebSocketImpl::didClose(unsigned long bufferedAmount, ClosingHandshakeCompl
etionStatus status, unsigned short code, const String& reason) |
| 165 { | 166 { |
| 166 m_client->didClose(bufferedAmount, static_cast<WebSocketClient::ClosingHands
hakeCompletionStatus>(status), code, WebString(reason)); | 167 m_client->didClose(bufferedAmount, static_cast<WebSocketClient::ClosingHands
hakeCompletionStatus>(status), code, WebString(reason)); |
| 167 } | 168 } |
| 168 | 169 |
| 169 } // namespace WebKit | 170 } // namespace WebKit |
| OLD | NEW |