Changeset 260556 in webkit

Timestamp:

Apr 22, 2020 9:56:44 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r260535.
​https://bugs.webkit.org/show_bug.cgi?id=210897

Causes crashes in WK1 (Requested by smfr on #webkit).

Reverted changeset:

"[ Mac wk2 ] imported/w3c/web-platform-tests/notifications
/event-onclose.html is flaky failing."
​https://bugs.webkit.org/show_bug.cgi?id=209483
​https://trac.webkit.org/changeset/260535

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/notifications/Notification.cpp (modified) (7 diffs)
• Source/WebCore/Modules/notifications/Notification.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r260535.
+        https://bugs.webkit.org/show_bug.cgi?id=210897
+
+        Causes crashes in WK1 (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        "[ Mac wk2 ] imported/w3c/web-platform-tests/notifications
+        /event-onclose.html is flaky failing."
+        https://bugs.webkit.org/show_bug.cgi?id=209483
+        https://trac.webkit.org/changeset/260535
+
 2020-04-22  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1029 +1029 @@
 webkit.org/b/209295 [ Debug ] imported/w3c/web-platform-tests/service-workers/service-worker/respond-with-body-accessed-response.https.html  [ Pass Failure ]
 
+webkit.org/b/209483 imported/w3c/web-platform-tests/notifications/event-onclose.html [ Pass Failure ]
+
 webkit.org/b/209503 [ Debug ] http/tests/referrer-policy-anchor/origin/cross-origin-http.https.html [ Pass Crash ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r260535.
+        https://bugs.webkit.org/show_bug.cgi?id=210897
+
+        Causes crashes in WK1 (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        "[ Mac wk2 ] imported/w3c/web-platform-tests/notifications
+        /event-onclose.html is flaky failing."
+        https://bugs.webkit.org/show_bug.cgi?id=209483
+        https://trac.webkit.org/changeset/260535
+
 2020-04-22  Darin Adler  <darin@apple.com>
 

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

@@ -65 +65 @@
     , m_tag(options.tag)
     , m_state(Idle)
+    , m_showNotificationTimer(&document, *this, &Notification::show)
 {
     if (!options.icon.isEmpty()) {
@@ -72 +73 @@
     }
 
-    queueTaskKeepingObjectAlive(*this, TaskSource::UserInteraction, [this] {
-        show();
-    });
+    m_showNotificationTimer.startOneShot(0_s);
+    m_showNotificationTimer.suspendIfNeeded();
 }
 
@@ -95 +95 @@
         return;
     }
-    if (client.show(this))
+    if (client.show(this)) {
         m_state = Showing;
+        setPendingActivity(*this);
+    }
 }
 
@@ -142 +144 @@
         return;
     m_state = Closed;
+    unsetPendingActivity(*this);
+}
+
+void Notification::queueTask(Function<void()>&& task)
+{
+    auto* document = this->document();
+    if (!document)
+        return;
+
+    document->eventLoop().queueTask(TaskSource::UserInteraction, WTFMove(task));
 }
 
 void Notification::dispatchShowEvent()
 {
-    queueTaskToDispatchEvent(*this, TaskSource::UserInteraction, Event::create(eventNames().showEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    queueTask([this, pendingActivity = makePendingActivity(*this)] {
+        dispatchEvent(Event::create(eventNames().showEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    });
 }
 
 void Notification::dispatchClickEvent()
 {
-    queueTaskKeepingObjectAlive(*this, TaskSource::UserInteraction, [this] {
+    queueTask([this, pendingActivity = makePendingActivity(*this)] {
         WindowFocusAllowedIndicator windowFocusAllowed;
         dispatchEvent(Event::create(eventNames().clickEvent, Event::CanBubble::No, Event::IsCancelable::No));
@@ -159 +173 @@
 void Notification::dispatchCloseEvent()
 {
-    queueTaskToDispatchEvent(*this, TaskSource::UserInteraction, Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    queueTask([this, pendingActivity = makePendingActivity(*this)] {
+        dispatchEvent(Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    });
     finalize();
 }
@@ -165 +181 @@
 void Notification::dispatchErrorEvent()
 {
-    queueTaskToDispatchEvent(*this, TaskSource::UserInteraction, Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    queueTask([this, pendingActivity = makePendingActivity(*this)] {
+        dispatchEvent(Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    });
 }
 
@@ -198 +216 @@
 }
 
-void Notification::eventListenersDidChange()
-{
-    m_hasRelevantEventListener = hasEventListeners(eventNames().clickEvent)
-        || hasEventListeners(eventNames().closeEvent)
-        || hasEventListeners(eventNames().errorEvent)
-        || hasEventListeners(eventNames().showEvent);
-}
-
-// A Notification object must not be garbage collected while the list of notifications contains its corresponding
-// notification and it has an event listener whose type is click, show, close, or error.
-// See https://notifications.spec.whatwg.org/#garbage-collection
-bool Notification::virtualHasPendingActivity() const
-{
-    return m_state == Showing && m_hasRelevantEventListener;
-}
-
 } // namespace WebCore
 

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

@@ -38 +38 @@
 #include "NotificationDirection.h"
 #include "NotificationPermission.h"
+#include "SuspendableTimer.h"
 #include <wtf/URL.h>
 #include "WritingMode.h"
@@ -96 +97 @@
     EventTargetInterface eventTargetInterface() const final { return NotificationEventTargetInterfaceType; }
 
+    void queueTask(Function<void()>&&);
+
     // ActiveDOMObject
     const char* activeDOMObjectName() const final;
     void suspend(ReasonForSuspension);
     void stop() final;
-    bool virtualHasPendingActivity() const final;
 
-    // EventTarget
     void refEventTarget() final { ref(); }
     void derefEventTarget() final { deref(); }
-    void eventListenersDidChange() final;
 
     String m_title;
@@ -116 +116 @@
     enum State { Idle, Showing, Closed };
     State m_state { Idle };
-    bool m_hasRelevantEventListener { false };
+
+    SuspendableTimer m_showNotificationTimer;
 };