Changeset 140927 in webkit

Timestamp:

Jan 27, 2013 2:58:30 AM (11 years ago)

Author:

jochen@chromium.org

Message:

Check notification permissions in the show() method
​https://bugs.webkit.org/show_bug.cgi?id=108009

Reviewed by Adam Barth.

Source/WebCore:

Tests: fast/notifications/notifications-constructor-with-permission.html

fast/notifications/notifications-constructor-without-permission.html

• Modules/notifications/Notification.cpp:

(WebCore::Notification::show):
(WebCore::Notification::taskTimerFired):

LayoutTests:

• fast/notifications/notifications-constructor-with-permission-expected.txt: Added.
• fast/notifications/notifications-constructor-with-permission.html: Added.
• fast/notifications/notifications-constructor-without-permission-expected.txt: Added.
• fast/notifications/notifications-constructor-without-permission.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/notifications/notifications-constructor-with-permission-expected.txt (added)
• LayoutTests/fast/notifications/notifications-constructor-with-permission.html (added)
• LayoutTests/fast/notifications/notifications-constructor-without-permission-expected.txt (added)
• LayoutTests/fast/notifications/notifications-constructor-without-permission.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/notifications/Notification.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-27  Jochen Eisinger  <jochen@chromium.org>
+
+        Check notification permissions in the show() method
+        https://bugs.webkit.org/show_bug.cgi?id=108009
+
+        Reviewed by Adam Barth.
+
+        * fast/notifications/notifications-constructor-with-permission-expected.txt: Added.
+        * fast/notifications/notifications-constructor-with-permission.html: Added.
+        * fast/notifications/notifications-constructor-without-permission-expected.txt: Added.
+        * fast/notifications/notifications-constructor-without-permission.html: Added.
+
 2013-01-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-27  Jochen Eisinger  <jochen@chromium.org>
+
+        Check notification permissions in the show() method
+        https://bugs.webkit.org/show_bug.cgi?id=108009
+
+        Reviewed by Adam Barth.
+
+        Tests: fast/notifications/notifications-constructor-with-permission.html
+               fast/notifications/notifications-constructor-without-permission.html
+
+        * Modules/notifications/Notification.cpp:
+        (WebCore::Notification::show):
+        (WebCore::Notification::taskTimerFired):
+
 2013-01-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/Modules/notifications/Notification.cpp

@@ -170 +170 @@
 {
     // prevent double-showing
-    if (m_state == Idle && m_notificationCenter->client() && m_notificationCenter->client()->show(this)) {
-        m_state = Showing;
-        setPendingActivity(this);
+    if (m_state == Idle && m_notificationCenter->client()) {
+#if ENABLE(NOTIFICATIONS)
+        if (!static_cast<Document*>(scriptExecutionContext())->page())
+            return;
+        if (NotificationController::from(static_cast<Document*>(scriptExecutionContext())->page())->client()->checkPermission(scriptExecutionContext()) != NotificationClient::PermissionAllowed) {
+            dispatchErrorEvent();
+            return;
+        }
+#endif
+        if (m_notificationCenter->client()->show(this)) {
+            m_state = Showing;
+            setPendingActivity(this);
+        }
     }
 }
@@ -241 +251 @@
 {
     ASSERT(scriptExecutionContext()->isDocument());
-    ASSERT(static_cast<Document*>(scriptExecutionContext())->page());
     ASSERT_UNUSED(timer, timer == m_taskTimer.get());
-    if (NotificationController::from(static_cast<Document*>(scriptExecutionContext())->page())->client()->checkPermission(scriptExecutionContext()) != NotificationClient::PermissionAllowed) {
-        dispatchErrorEvent();
-        return;
-    }
     show();
 }