diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2014-01-10 14:21:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 16:32:20 +0100 |
commit | 54f66cc7a1e17155e90a1d3b5c33f627dbd0d50f (patch) | |
tree | 6dd4b35eda74487977bfae5bb0b81a133dfc1bf4 /src/webchannel/qwebchannelsocket.cpp | |
parent | 05bafd509ca302fc63465fece7cd0c33ec602e31 (diff) | |
download | qtwebchannel-54f66cc7a1e17155e90a1d3b5c33f627dbd0d50f.tar.gz |
Make the underlying transport mechanism of the webchannel pluggable.
This enables us to optionally use navigator.qt instead of a WebSocket,
which is nicer setup-wise and is also slightly faster:
navigator.qt:
284.0 msecs per iteration (total: 2,840, iterations: 10)
WebSocket:
295.8 msecs per iteration (total: 2,959, iterations: 10)
The baseline is ca. 203 msecs, which would mean a performance boost
of ca. 12.7%.
Furthermore, this sets the fundation to eventually add a WebEngine
transport mechanism. The WebViewTransport should also be removed and
instead the WebView itself should directly implement the
WebChannelTransportInterface.
Change-Id: I368bb27e38ffa2f17ffeb7f5ae695690f6f5ad21
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webchannel/qwebchannelsocket.cpp')
-rw-r--r-- | src/webchannel/qwebchannelsocket.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/webchannel/qwebchannelsocket.cpp b/src/webchannel/qwebchannelsocket.cpp index 84e6685..b3daf8f 100644 --- a/src/webchannel/qwebchannelsocket.cpp +++ b/src/webchannel/qwebchannelsocket.cpp @@ -48,11 +48,14 @@ QT_BEGIN_NAMESPACE QWebChannelSocket::QWebChannelSocket(QObject *parent) : QWebSocketServer(parent) + , m_messageHandler(Q_NULLPTR) , m_useSecret(true) , m_starting(false) { connect(this, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketError())); + connect(this, SIGNAL(textDataReceived(QString)), + SLOT(messageReceived(QString))); } void QWebChannelSocket::initLater() @@ -100,4 +103,11 @@ void QWebChannelSocket::socketError() emit failed(errorString()); } +void QWebChannelSocket::messageReceived(const QString &message) +{ + if (m_messageHandler) { + m_messageHandler->handleMessage(message); + } +} + QT_END_NAMESPACE |