Attachment 121094 Details for Bug 71693 – proposed fix

[patch] proposed fix

0104.patch (text/plain), 6.26 KB, created by Kristóf Kosztyó on 2012-01-04 04:16:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Kristóf Kosztyó

Created: 2012-01-04 04:16:54 PST

Size: 6.26 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 4a1d771..cb5d563 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2012-01-04  KristÃ³f KosztyÃ³  <kkristof@inf.u-szeged.hu>
>+
>+        [Qt] http/tests/notifications tests make fast/notifications/notifications-click-event.html failed
>+        https://bugs.webkit.org/show_bug.cgi?id=71693
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/qt/Skipped: Unskip http/tests/notifications/icon-does-not-exist.html and
>+        http/tests/notifications/icon-exists-show-alert-during-load.html
>+
> 2012-01-04  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
> 
>         [Qt] http/tests/xmlhttprequest/workers/abort-exception-assert.html makes 6 fast/workers test fail
>diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
>index 5f0126f..80516b8 100644
>--- a/LayoutTests/platform/qt/Skipped
>+++ b/LayoutTests/platform/qt/Skipped
>@@ -2454,11 +2454,6 @@ fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
> # https://bugs.webkit.org/show_bug.cgi?id=71766
> svg/custom/getBBox-path.svg
> 
>-# [Qt] http/tests/notifications tests make fast/notifications/notifications-click-event.html fail
>-# https://bugs.webkit.org/show_bug.cgi?id=71693
>-http/tests/notifications/icon-does-not-exist.html
>-http/tests/notifications/icon-exists-show-alert-during-load.html
>-
> # [Qt] new test editing/spelling/spelling-unified-emulation.html is failing
> # https://bugs.webkit.org/show_bug.cgi?id=72251
> editing/spelling/spelling-unified-emulation.html
>diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
>index a96ff6a..3460226 100644
>--- a/Source/WebKit/qt/ChangeLog
>+++ b/Source/WebKit/qt/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-01-04  KristÃ³f KosztyÃ³  <kkristof@inf.u-szeged.hu>
>+
>+        [Qt] http/tests/notifications tests make fast/notifications/notifications-click-event.html failed
>+        https://bugs.webkit.org/show_bug.cgi?id=71693
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
>+        (DumpRenderTreeSupportQt::resetNotifications):
>+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
>+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
>+        (WebCore::NotificationPresenterClientQt::resetNotifications):
>+        * WebCoreSupport/NotificationPresenterClientQt.h:
>+
> 2012-01-03  Jon Lee  <jonlee@apple.com>
> 
>         Leak of WebNotificationClient when page is destroyed
>diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
>index 92ecdf8..324e544 100644
>--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
>+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
>@@ -820,6 +820,11 @@ void DumpRenderTreeSupportQt::dumpNotification(bool b)
> #endif
> }
> 
>+void DumpRenderTreeSupportQt::resetNotifications()
>+{
>+    NotificationPresenterClientQt::notificationPresenter()->resetNotifications();
>+}
>+
> QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, int deviceDPI, const QSize& deviceSize, const QSize& availableSize)
> {
>     WebCore::ViewportArguments args = page->d->viewportArguments();
>diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
>index 7aa9f1d..9d025d2 100644
>--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
>+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
>@@ -189,6 +189,7 @@ public:
>     static void dumpSetAcceptsEditing(bool b);
> 
>     static void dumpNotification(bool b);
>+    static void resetNotifications();
> 
>     static QMap<QString, QWebHistoryItem> getChildHistoryItems(const QWebHistoryItem& historyItem);
>     static bool isTargetItem(const QWebHistoryItem& historyItem);
>diff --git a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
>index 8200664..5792a4a 100644
>--- a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
>+++ b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
>@@ -169,6 +169,14 @@ void NotificationPresenterClientQt::removeClient()
>     }
> }
> 
>+void NotificationPresenterClientQt::resetNotifications()
>+{
>+    while (!m_notifications.isEmpty()) {
>+        NotificationsQueue::Iterator iter = m_notifications.begin();
>+        detachNotification(iter.key());
>+    }
>+}
>+
> bool NotificationPresenterClientQt::show(Notification* notification)
> {
>     // FIXME: workers based notifications are not supported yet.
>diff --git a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h
>index 77dcd3b..e19124c 100644
>--- a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h
>+++ b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h
>@@ -109,6 +109,8 @@ public:
>     void notificationClicked(NotificationWrapper*);
>     void notificationClicked(const QString& title);
> 
>+    void resetNotifications();
>+
> private:
>     void sendEvent(Notification*, const AtomicString& eventName);
>     void displayNotification(Notification*, const QByteArray&);
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index bf1afe8..666a6b6 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2012-01-04  KristÃ³f KosztyÃ³  <kkristof@inf.u-szeged.hu>
>+
>+        [Qt] http/tests/notifications tests make fast/notifications/notifications-click-event.html failed
>+        https://bugs.webkit.org/show_bug.cgi?id=71693
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
>+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
>+
> 2012-01-04  Mary Wu  <mary.wu@torchmobile.com.cn>
> 
>         Enable DOWNLOAD_ATTRIBUTE in BlackBerry porting
>diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>index c1a3ed4..a0d2fd2 100644
>--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
>@@ -559,6 +559,8 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
> 
>     DumpRenderTreeSupportQt::resetOriginAccessWhiteLists();
> 
>+    DumpRenderTreeSupportQt::resetNotifications();
>+
>     // Qt defaults to Windows editing behavior.
>     DumpRenderTreeSupportQt::setEditingBehavior(m_page, "win");
>

Flags:

hausmann: review+
webkit.review.bot: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 71693: 121094