summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-25 13:35:59 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-25 13:35:59 +0200
commit79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch)
tree0287b1a69d84492c901e8bc820e635e7133809a0 /Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp
parent682ab87480e7757346802ce7f54cfdbdfeb2339e (diff)
downloadqtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp')
-rw-r--r--Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp b/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp
index 6a9c5b393..4503104a3 100644
--- a/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp
+++ b/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp
@@ -23,6 +23,7 @@
#include "WebSocketServerQt.h"
#include "WebSocketServer.h"
+#include "WebSocketServerConnection.h"
#include <WebCore/SocketStreamHandle.h>
#include <wtf/PassOwnPtr.h>
@@ -55,7 +56,9 @@ void QtTcpServerHandler::handleNewConnection()
{
QTcpSocket* socket = m_serverSocket.nextPendingConnection();
ASSERT(socket);
- m_webSocketServer->didAcceptConnection(SocketStreamHandle::create(socket, 0));
+ OwnPtr<WebSocketServerConnection> conection = adoptPtr(new WebSocketServerConnection(m_webSocketServer->client(), m_webSocketServer));
+ conection->setSocketHandle(SocketStreamHandle::create(socket, conection.get()));
+ m_webSocketServer->didAcceptConnection(conection.release());
}
bool QtTcpServerHandler::listen(const String& bindAddress, unsigned short port)