Changeset 54279 in webkit

Timestamp:

Feb 3, 2010 5:42:51 AM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

[Qt] WebSockets : Buffer the data in WebKit instead of QtNetwork
​https://bugs.webkit.org/show_bug.cgi?id=34425

Reviewed by Kenneth Rohde Christiansen.

Buffer the sent data in SocketStreamHandlePrivate instead of relying on
the network layer to do it. This is more robust and more consistent with how
Qt's HTTP stack works.
Close the socket in SocketStreamHandlePrivate::close() regardless of its state.

No new tests, since no new functionality is introduced.

• platform/network/qt/SocketStreamHandlePrivate.h:
• platform/network/qt/SocketStreamHandleQt.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/qt/SocketStreamHandlePrivate.h (modified) (2 diffs)
• platform/network/qt/SocketStreamHandleQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-02  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] WebSockets : Buffer the data in WebKit instead of QtNetwork
+        https://bugs.webkit.org/show_bug.cgi?id=34425
+
+        Buffer the sent data in SocketStreamHandlePrivate instead of relying on
+        the network layer to do it. This is more robust and more consistent with how 
+        Qt's HTTP stack works.
+        Close the socket in SocketStreamHandlePrivate::close() regardless of its state.
+
+        No new tests, since no new functionality is introduced.
+
+        * platform/network/qt/SocketStreamHandlePrivate.h:
+        * platform/network/qt/SocketStreamHandleQt.cpp:
+        (WebCore::SocketStreamHandlePrivate::SocketStreamHandlePrivate):
+        (WebCore::SocketStreamHandlePrivate::send):
+        (WebCore::SocketStreamHandlePrivate::close):
+        (WebCore::SocketStreamHandlePrivate::socketBytesWritten):
+
 2010-02-03  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebCore/platform/network/qt/SocketStreamHandlePrivate.h

@@ -56 +56 @@
     void close();
     void socketSentdata();
+    void socketBytesWritten(qint64);
     void socketClosed();
     void socketError(QAbstractSocket::SocketError);
@@ -66 +67 @@
     QTcpSocket* m_socket;
     SocketStreamHandle* m_streamHandle;
+    QByteArray m_data;
 };
 

trunk/WebCore/platform/network/qt/SocketStreamHandleQt.cpp

@@ -57 +57 @@
         return;
 
-    connect(m_socket, SIGNAL(connected()), this, SLOT(socketConnected()));
+    if (isSecure) {
+#ifndef QT_NO_OPENSSL
+        connect(m_socket, SIGNAL(encrypted()), this, SLOT(socketConnected()));
+        connect(m_socket, SIGNAL(encryptedBytesWritten(qint64)), this, SLOT(socketBytesWritten(qint64)));
+#endif
+    } else {
+        connect(m_socket, SIGNAL(connected()), this, SLOT(socketConnected()));
+        connect(m_socket, SIGNAL(bytesWritten(qint64)), this, SLOT(socketBytesWritten(qint64)));
+    }
     connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
     connect(m_socket, SIGNAL(disconnected()), this, SLOT(socketClosed()));
@@ -100 +108 @@
     if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
         return 0;
-    quint64 sentSize = m_socket->write(data, len);
-    QMetaObject::invokeMethod(this, "socketSentData", Qt::QueuedConnection);
-    return sentSize;
+    // If we are already sending something, then m_data is not empty.
+    bool sending = m_data.length() > 0;
+    m_data.append(data, len);
+    if (!sending)
+        m_socket->write(m_data);
+    return len;
 }
 
 void SocketStreamHandlePrivate::close()
 {
-    if (m_socket && m_socket->state() == QAbstractSocket::ConnectedState)
+    if (m_socket)
         m_socket->close();
 }
@@ -115 +126 @@
     if (m_streamHandle)
         m_streamHandle->sendPendingData();
+}
+
+void SocketStreamHandlePrivate::socketBytesWritten(qint64 written)
+{
+    if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState || written < 0)
+        return;
+    m_data.remove(0, written);
+    // If we are done sending all the data, then m_data is now empty
+    if (m_data.isEmpty())
+        QMetaObject::invokeMethod(this, "socketSentdata", Qt::QueuedConnection);
+    else
+        m_socket->write(m_data);
 }