Changeset 259068 in webkit

Timestamp:

Mar 26, 2020 1:25:15 PM (4 years ago)

Author:

Chris Dumez

Message:

REGRESSION: ASSERTION FAILED: m_wrapper on storage/indexeddb/modern/abort-requests tests
​https://bugs.webkit.org/show_bug.cgi?id=209499
<rdar://problem/60842165>

Reviewed by Alex Christensen.

Source/WebCore:

IDBTransaction::hasPendingActivity() was failing to consult ActiveDOMObject::hasPendingActivity()
so the JS wrapper would get garbage collected even though the ActiveDOMObject base class was
aware of some pending activity.

No new tests, unskipped existing tests.

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::hasPendingActivity const):

LayoutTests:

Unskip tests that should no longer be flaky.

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-26  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION: ASSERTION FAILED: m_wrapper on storage/indexeddb/modern/abort-requests tests
+        https://bugs.webkit.org/show_bug.cgi?id=209499
+        <rdar://problem/60842165>
+
+        Reviewed by Alex Christensen.
+
+        Unskip tests that should no longer be flaky.
+
+        * platform/mac-wk1/TestExpectations:
+
 2020-03-25  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -962 +962 @@
 webkit.org/b/209494 fast/events/mouse-cursor-no-mousemove.html [ Pass Failure ]
 
-webkit.org/b/209499 [ Catalina ] storage/indexeddb/modern/abort-requests-cancelled.html [ Pass Timeout Crash ]
-
-webkit.org/b/209499 [ Catalina ] storage/indexeddb/modern/abort-requests-cancelled-private.html [ Pass Timeout Crash ]
-
 webkit.org/b/209560 imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress.htm [ Pass Crash Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-26  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION: ASSERTION FAILED: m_wrapper on storage/indexeddb/modern/abort-requests tests
+        https://bugs.webkit.org/show_bug.cgi?id=209499
+        <rdar://problem/60842165>
+
+        Reviewed by Alex Christensen.
+
+        IDBTransaction::hasPendingActivity() was failing to consult ActiveDOMObject::hasPendingActivity()
+        so the JS wrapper would get garbage collected even though the ActiveDOMObject base class was
+        aware of some pending activity.
+
+        No new tests, unskipped existing tests.
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::hasPendingActivity const):
+
 2020-03-25  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

@@ -319 +319 @@
 {
     ASSERT(canCurrentThreadAccessThreadLocalData(m_database->originThread()) || Thread::mayBeGCThread());
+    if (ActiveDOMObject::hasPendingActivity())
+        return true;
+
     return !m_contextStopped && m_state != IndexedDB::TransactionState::Finished;
 }