Changeset 63738 in webkit

Timestamp:

Jul 20, 2010 4:46:06 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-07-20 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DRT sideeffect revealed by r63657
​https://bugs.webkit.org/show_bug.cgi?id=42578

Don't set an automatic timeout for notifications when running in DRT.
This fixes an issue with cancel() notifications in unrelated tests.

• WebCoreSupport/NotificationPresenterClientQt.cpp: (WebCore::NotificationPresenterClientQt::displayNotification):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/NotificationPresenterClientQt.cpp (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-07-20  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT sideeffect revealed by r63657
+        https://bugs.webkit.org/show_bug.cgi?id=42578
+
+        Don't set an automatic timeout for notifications when running in DRT.
+        This fixes an issue with cancel() notifications in unrelated tests.
+
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationPresenterClientQt::displayNotification):
+
 2010-07-18  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

@@ -184 +184 @@
     if (!wrapper->m_presenter) {
 #ifndef QT_NO_SYSTEMTRAYICON
-        wrapper->m_closeTimer.startOneShot(notificationTimeout);
+        if (!dumpNotification)
+            wrapper->m_closeTimer.startOneShot(notificationTimeout);
         QPixmap pixmap;
         if (bytes.length() && pixmap.loadFromData(bytes)) {