[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 11:21:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bed7ade891c2c8507bfdd8544ab434e611cd2517
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 11:46:06 2010 +0000
2010-07-20 Andreas Kling <andreas.kling at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63738 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a6c17f0..b83bab7 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-20 Andreas Kling <andreas.kling at 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 at nokia.com>
Reviewed by Antonio Gomes.
diff --git a/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
index a037592..ee69103 100644
--- a/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
@@ -183,7 +183,8 @@ void NotificationPresenterClientQt::displayNotification(Notification* notificati
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)) {
QIcon icon(pixmap);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list