Changeset 127321 in webkit

Timestamp:

Aug 31, 2012 2:26:44 PM (12 years ago)

Author:

jonlee@apple.com

Message:

ondisplay event handlers are not called
​https://bugs.webkit.org/show_bug.cgi?id=95263
<rdar://problem/12193359>

Reviewed by Alexey Proskuryakov.

Source/WebCore:

To support the legacy API, we conflate ondisplay and onshow.

• Modules/notifications/Notification.h:

(WebCore::Notification::ondisplay): Use display event as an alias for the show event.
(WebCore::Notification::setOndisplay):

LayoutTests:

Adjust the test to use the ondisplay handler, to fully test legacy API.

• http/tests/notifications/legacy/show-expected.txt: Verify that event listener for ondisplay is

the same as that for onshow.

• http/tests/notifications/legacy/show.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/notifications/legacy/show-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/notifications/legacy/show.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/notifications/Notification.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-31  Jon Lee  <jonlee@apple.com>
+
+        ondisplay event handlers are not called
+        https://bugs.webkit.org/show_bug.cgi?id=95263
+        <rdar://problem/12193359>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Adjust the test to use the ondisplay handler, to fully test legacy API.
+
+        * http/tests/notifications/legacy/show-expected.txt: Verify that event listener for ondisplay is
+        the same as that for onshow.
+        * http/tests/notifications/legacy/show.html:
+
 2012-08-31  Roger Fong  <roger_fong@apple.com>
 

trunk/LayoutTests/http/tests/notifications/legacy/show-expected.txt

@@ -9 +9 @@
 PASS window.webkitNotifications.checkPermission() is 0
 PASS ondisplay event handler was called
+PASS this.ondisplay is this.onshow
 Denying permission to http://127.0.0.1:8000
 PASS window.webkitNotifications.checkPermission() is 2

trunk/LayoutTests/http/tests/notifications/legacy/show.html

@@ -23 +23 @@
 
         n = window.webkitNotifications.createNotification("", "title 2", "body");
-        n.onshow = function() {
+        n.ondisplay = function() {
                 testPassed("ondisplay event handler was called");
+                shouldBe("this.ondisplay", "this.onshow");
                 setTimeout(part3, 0);
         };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-31  Jon Lee  <jonlee@apple.com>
+
+        ondisplay event handlers are not called
+        https://bugs.webkit.org/show_bug.cgi?id=95263
+        <rdar://problem/12193359>
+
+        Reviewed by Alexey Proskuryakov.
+
+        To support the legacy API, we conflate ondisplay and onshow.
+
+        * Modules/notifications/Notification.h:
+        (WebCore::Notification::ondisplay): Use display event as an alias for the show event.
+        (WebCore::Notification::setOndisplay):
+
 2012-08-31  Tony Chang  <tony@chromium.org>
 

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

@@ -108 +108 @@
     TextDirection direction() const { return dir() == "rtl" ? RTL : LTR; }
 
+#if ENABLE(LEGACY_NOTIFICATIONS)
+    EventListener* ondisplay() { return getAttributeEventListener(eventNames().showEvent); }
+    void setOndisplay(PassRefPtr<EventListener> listener) { setAttributeEventListener(eventNames().showEvent, listener); }
+#endif
     DEFINE_ATTRIBUTE_EVENT_LISTENER(show);
-#if ENABLE(LEGACY_NOTIFICATIONS)
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(display);
-#endif
     DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(close);