diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit/chromium/src/WebSocketImpl.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit/chromium/src/WebSocketImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebSocketImpl.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebSocketImpl.cpp b/Source/WebKit/chromium/src/WebSocketImpl.cpp index f0bf28206..30a6033d3 100644 --- a/Source/WebKit/chromium/src/WebSocketImpl.cpp +++ b/Source/WebKit/chromium/src/WebSocketImpl.cpp @@ -105,10 +105,19 @@ WebString WebSocketImpl::subprotocol() #endif } +WebString WebSocketImpl::extensions() +{ +#if ENABLE(WEB_SOCKETS) + return m_private->extensions(); +#else + ASSERT_NOT_REACHED(); +#endif +} + bool WebSocketImpl::sendText(const WebString& message) { #if ENABLE(WEB_SOCKETS) - return m_private->send(message); + return m_private->send(message) == ThreadableWebSocketChannel::SendSuccess; #else ASSERT_NOT_REACHED(); #endif @@ -117,7 +126,7 @@ bool WebSocketImpl::sendText(const WebString& message) bool WebSocketImpl::sendArrayBuffer(const WebArrayBuffer& webArrayBuffer) { #if ENABLE(WEB_SOCKETS) - return m_private->send(*PassRefPtr<ArrayBuffer>(webArrayBuffer)); + return m_private->send(*PassRefPtr<ArrayBuffer>(webArrayBuffer)) == ThreadableWebSocketChannel::SendSuccess; #else ASSERT_NOT_REACHED(); #endif |