Changeset 235410 in webkit

Timestamp:

Aug 27, 2018 4:41:11 PM (6 years ago)

Author:

youenn@apple.com

Message:

Various IndexDB tests abandon documents
​https://bugs.webkit.org/show_bug.cgi?id=188728
<rdar://problem/43651095>

Reviewed by Alex Christensen.

Source/WebCore:

Some IDB objects implement hasPendingActivity but there are some possibilities that they continue returning true after being stopped.
This is the case for requests that get stopped while still waiting for some pending activity.
This is also the case for requests that emits upgradeneeded or blocked events.

Enforce that these objects return false to hasPendingActivity once being stopped.
This ensures that they can be garbage collected once their context is preparing for destruction like in Document::prepareForDestruction.

Test: http/tests/IndexedDB/collect-IDB-objects.https.html

• Modules/indexeddb/IDBIndex.cpp:

(WebCore::IDBIndex::hasPendingActivity const):

• Modules/indexeddb/IDBObjectStore.cpp:

(WebCore::IDBObjectStore::hasPendingActivity const):

• Modules/indexeddb/IDBRequest.cpp:

(WebCore::IDBRequest::hasPendingActivity const):
(WebCore::IDBRequest::enqueueEvent):

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::notifyDidAbort):
In case the context is stopped, IDBTransaction should not ask IDBRequest to fire an event.

LayoutTests:

• http/tests/IndexedDB/collect-IDB-objects.https-expected.txt: Added.
• http/tests/IndexedDB/collect-IDB-objects.https.html: Added.
• http/tests/IndexedDB/resources/myidbframe.htm: Added.
• http/tests/IndexedDB/resources/support.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/IndexedDB (added)
• LayoutTests/http/tests/IndexedDB/collect-IDB-objects.https-expected.txt (added)
• LayoutTests/http/tests/IndexedDB/collect-IDB-objects.https.html (added)
• LayoutTests/http/tests/IndexedDB/resources (added)
• LayoutTests/http/tests/IndexedDB/resources/myidbframe.htm (added)
• LayoutTests/http/tests/IndexedDB/resources/support.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBIndex.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBRequest.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-27  Youenn Fablet  <youenn@apple.com>
+
+        Various IndexDB tests abandon documents
+        https://bugs.webkit.org/show_bug.cgi?id=188728
+        <rdar://problem/43651095>
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/IndexedDB/collect-IDB-objects.https-expected.txt: Added.
+        * http/tests/IndexedDB/collect-IDB-objects.https.html: Added.
+        * http/tests/IndexedDB/resources/myidbframe.htm: Added.
+        * http/tests/IndexedDB/resources/support.js: Added.
+
 2018-08-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-27  Youenn Fablet  <youenn@apple.com>
+
+        Various IndexDB tests abandon documents
+        https://bugs.webkit.org/show_bug.cgi?id=188728
+        <rdar://problem/43651095>
+
+        Reviewed by Alex Christensen.
+
+        Some IDB objects implement hasPendingActivity but there are some possibilities that they continue returning true after being stopped.
+        This is the case for requests that get stopped while still waiting for some pending activity.
+        This is also the case for requests that emits upgradeneeded or blocked events.
+
+        Enforce that these objects return false to hasPendingActivity once being stopped.
+        This ensures that they can be garbage collected once their context is preparing for destruction like in Document::prepareForDestruction.
+
+        Test: http/tests/IndexedDB/collect-IDB-objects.https.html
+
+        * Modules/indexeddb/IDBIndex.cpp:
+        (WebCore::IDBIndex::hasPendingActivity const):
+        * Modules/indexeddb/IDBObjectStore.cpp:
+        (WebCore::IDBObjectStore::hasPendingActivity const):
+        * Modules/indexeddb/IDBRequest.cpp:
+        (WebCore::IDBRequest::hasPendingActivity const):
+        (WebCore::IDBRequest::enqueueEvent):
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::notifyDidAbort):
+        In case the context is stopped, IDBTransaction should not ask IDBRequest to fire an event.
+
 2018-08-27  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -70 +70 @@
 bool IDBIndex::hasPendingActivity() const
 {
-    return !m_objectStore.transaction().isFinished();
+    return m_objectStore.transaction().hasPendingActivity();
 }
 

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

@@ -83 +83 @@
 bool IDBObjectStore::hasPendingActivity() const
 {
-    return !m_transaction.isFinished();
+    return m_transaction.hasPendingActivity();
 }
 

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

@@ -262 +262 @@
 {
     ASSERT(&originThread() == &Thread::current() || mayBeGCThread());
-    return m_hasPendingActivity;
+    return !m_contextStopped && m_hasPendingActivity;
 }
 
@@ -285 +285 @@
 {
     ASSERT(&originThread() == &Thread::current());
-    if (!scriptExecutionContext() || m_contextStopped)
+    if (m_contextStopped)
         return;
 

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

@@ -552 +552 @@
     fireOnAbort();
 
-    if (isVersionChange()) {
+    if (isVersionChange() && !m_contextStopped) {
         ASSERT(m_openDBRequest);
         m_openDBRequest->fireErrorAfterVersionChangeCompletion();