Changeset 52153 in webkit

Timestamp:

Dec 15, 2009 8:17:56 AM (14 years ago)

Author:

zecke@webkit.org

Message:

[Qt] Followup for direct signals and slots connections in QNetworkReplyHandler

​https://bugs.webkit.org/show_bug.cgi?id=32113

For Qt versions prior to 4.6.1 we will need to use QueuedConnection
for the signal and slot connection to avoid running into a bug in.

Add a comment that we want to remove one signal to forward
queued items when moving our minimum requirements.

• platform/network/qt/QNetworkReplyHandler.cpp:

(WebCore::QNetworkReplyHandler::start):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/qt/QNetworkReplyHandler.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-15  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Followup for direct signals and slots connections in QNetworkReplyHandler
+        https://bugs.webkit.org/show_bug.cgi?id=32113
+
+        For Qt versions prior to 4.6.1 we will need to use QueuedConnection
+        for the signal and slot connection to avoid running into a bug in.
+
+        Add a comment that we want to remove one signal to forward
+        queued items when moving our minimum requirements.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::start):
+
 2009-12-14  Holger Hans Peter Freyther  <zecke@selfish.org>
 

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

@@ -38 +38 @@
 #include <QDebug>
 #include <QCoreApplication>
+
+// What type of connection should be used for the signals of the
+// QNetworkReply? This depends on if Qt has a bugfix for this or not.
+// It is fixed in Qt 4.6.1. See https://bugs.webkit.org/show_bug.cgi?id=32113
+#if QT_VERSION > QT_VERSION_CHECK(4, 6, 0)
+#define SIGNAL_CONN Qt::DirectConnection
+#else
+#define SIGNAL_CONN Qt::QueuedConnection
+#endif
+
 
 namespace WebCore {
@@ -432 +442 @@
 
     connect(m_reply, SIGNAL(finished()),
-            this, SLOT(finish()), Qt::DirectConnection);
+            this, SLOT(finish()), SIGNAL_CONN);
 
     // For http(s) we know that the headers are complete upon metaDataChanged() emission, so we
@@ -438 +448 @@
     if (scheme == QLatin1String("http") || scheme == QLatin1String("https"))
         connect(m_reply, SIGNAL(metaDataChanged()),
-                this, SLOT(sendResponseIfNeeded()), Qt::DirectConnection);
+                this, SLOT(sendResponseIfNeeded()), SIGNAL_CONN);
 
     connect(m_reply, SIGNAL(readyRead()),
-            this, SLOT(forwardData()), Qt::DirectConnection);
+            this, SLOT(forwardData()), SIGNAL_CONN);
+
+    // Make this a direct function call once we require 4.6.1+.
     connect(this, SIGNAL(processQueuedItems()),
-            this, SLOT(sendQueuedItems()), Qt::DirectConnection);
+            this, SLOT(sendQueuedItems()), SIGNAL_CONN);
 }