<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[201390] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201390">201390</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-25 11:20:26 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: IDB objects from a worker thread might be destroyed on the main thread.
https://bugs.webkit.org/show_bug.cgi?id=158004
Reviewed by Alex Christensen.
No new tests (Spuriously reproduces on the bots, but I've been unable to construct a reliable test).
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::completeOpenDBRequest):
(WebCore::IDBClient::IDBConnectionProxy::notifyOpenDBRequestBlocked):
(WebCore::IDBClient::IDBConnectionProxy::didCommitTransaction):
(WebCore::IDBClient::IDBConnectionProxy::didAbortTransaction):
(WebCore::IDBClient::IDBConnectionProxy::unregisterDatabaseConnection):
(WebCore::IDBClient::removeItemsMatchingCurrentThread):
(WebCore::IDBClient::IDBConnectionProxy::forgetActivityForCurrentThread): Clear out all objects that originated on this thread.
(WebCore::IDBClient::IDBConnectionProxy::takeIDBOpenDBRequest): Deleted.
* Modules/indexeddb/client/IDBConnectionProxy.h:
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::stopIndexedDatabase):
* workers/WorkerGlobalScope.h:
* workers/WorkerThread.cpp:
(WebCore::WorkerThread::stop):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201389 => 201390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 18:02:13 UTC (rev 201389)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 18:20:26 UTC (rev 201390)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-05-25 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: IDB objects from a worker thread might be destroyed on the main thread.
+ https://bugs.webkit.org/show_bug.cgi?id=158004
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Spuriously reproduces on the bots, but I've been unable to construct a reliable test).
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::completeOpenDBRequest):
+ (WebCore::IDBClient::IDBConnectionProxy::notifyOpenDBRequestBlocked):
+ (WebCore::IDBClient::IDBConnectionProxy::didCommitTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::didAbortTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::unregisterDatabaseConnection):
+ (WebCore::IDBClient::removeItemsMatchingCurrentThread):
+ (WebCore::IDBClient::IDBConnectionProxy::forgetActivityForCurrentThread): Clear out all objects that originated on this thread.
+ (WebCore::IDBClient::IDBConnectionProxy::takeIDBOpenDBRequest): Deleted.
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::stopIndexedDatabase):
+ * workers/WorkerGlobalScope.h:
+
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThread::stop):
+
</ins><span class="cx"> 2016-05-25 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Remove unused slotBase parameter in bindings generator
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (201389 => 201390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-25 18:02:13 UTC (rev 201389)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-25 18:20:26 UTC (rev 201390)
</span><span class="lines">@@ -100,18 +100,6 @@
</span><span class="cx"> completeOpenDBRequest(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<IDBOpenDBRequest> IDBConnectionProxy::takeIDBOpenDBRequest(IDBOpenDBRequest& request)
-{
- ASSERT(request.originThreadID() == currentThread());
-
- Locker<Lock> locker(m_openDBRequestMapLock);
-
- auto mappedRequest = m_openDBRequestMap.take(request.resourceIdentifier());
- ASSERT(mappedRequest.get() == &request);
-
- return mappedRequest;
-}
-
</del><span class="cx"> void IDBConnectionProxy::completeOpenDBRequest(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -120,10 +108,10 @@
</span><span class="cx"> {
</span><span class="cx"> Locker<Lock> locker(m_openDBRequestMapLock);
</span><span class="cx"> request = m_openDBRequestMap.get(resultData.requestIdentifier());
</span><del>- ASSERT(request);
</del><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(request);
</del><ins>+ if (!request)
+ return;
</ins><span class="cx">
</span><span class="cx"> request->performCallbackOnOriginThread(*request, &IDBOpenDBRequest::requestCompleted, resultData);
</span><span class="cx"> }
</span><span class="lines">@@ -272,7 +260,8 @@
</span><span class="cx"> request = m_openDBRequestMap.get(requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(request);
</del><ins>+ if (!request)
+ return;
</ins><span class="cx">
</span><span class="cx"> request->performCallbackOnOriginThread(*request, &IDBOpenDBRequest::requestBlocked, oldVersion, newVersion);
</span><span class="cx"> }
</span><span class="lines">@@ -325,7 +314,8 @@
</span><span class="cx"> transaction = m_committingTransactions.take(transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(transaction);
</del><ins>+ if (!transaction)
+ return;
</ins><span class="cx">
</span><span class="cx"> transaction->performCallbackOnOriginThread(*transaction, &IDBTransaction::didCommit, error);
</span><span class="cx"> }
</span><span class="lines">@@ -349,7 +339,8 @@
</span><span class="cx"> transaction = m_abortingTransactions.take(transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(transaction);
</del><ins>+ if (!transaction)
+ return;
</ins><span class="cx">
</span><span class="cx"> transaction->performCallbackOnOriginThread(*transaction, &IDBTransaction::didAbort, error);
</span><span class="cx"> }
</span><span class="lines">@@ -440,8 +431,7 @@
</span><span class="cx"> {
</span><span class="cx"> Locker<Lock> locker(m_databaseConnectionMapLock);
</span><span class="cx">
</span><del>- ASSERT(m_databaseConnectionMap.contains(database.databaseConnectionIdentifier()));
- ASSERT(m_databaseConnectionMap.get(database.databaseConnectionIdentifier()) == &database);
</del><ins>+ ASSERT(!m_databaseConnectionMap.contains(database.databaseConnectionIdentifier()) || m_databaseConnectionMap.get(database.databaseConnectionIdentifier()) == &database);
</ins><span class="cx"> m_databaseConnectionMap.remove(database.databaseConnectionIdentifier());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -453,6 +443,46 @@
</span><span class="cx"> m_activeOperations.remove(operation->identifier());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename KeyType, typename ValueType>
+void removeItemsMatchingCurrentThread(HashMap<KeyType, ValueType>& map)
+{
+ auto currentThreadID = currentThread();
+
+ Vector<KeyType> keys;
+ keys.reserveInitialCapacity(map.size());
+ for (auto& iterator : map) {
+ if (iterator.value->originThreadID() == currentThreadID)
+ keys.uncheckedAppend(iterator.key);
+ }
+
+ for (auto& key : keys)
+ map.remove(key);
+}
+
+void IDBConnectionProxy::forgetActivityForCurrentThread()
+{
+ ASSERT(!isMainThread());
+
+ {
+ Locker<Lock> lock(m_databaseConnectionMapLock);
+ removeItemsMatchingCurrentThread(m_databaseConnectionMap);
+ }
+ {
+ Locker<Lock> lock(m_openDBRequestMapLock);
+ removeItemsMatchingCurrentThread(m_openDBRequestMap);
+ }
+ {
+ Locker<Lock> lock(m_transactionMapLock);
+ removeItemsMatchingCurrentThread(m_pendingTransactions);
+ removeItemsMatchingCurrentThread(m_committingTransactions);
+ removeItemsMatchingCurrentThread(m_abortingTransactions);
+ }
+ {
+ Locker<Lock> lock(m_transactionOperationLock);
+ removeItemsMatchingCurrentThread(m_activeOperations);
+ }
+}
+
</ins><span class="cx"> } // namesapce IDBClient
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (201389 => 201390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-25 18:02:13 UTC (rev 201389)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-25 18:20:26 UTC (rev 201390)
</span><span class="lines">@@ -110,9 +110,8 @@
</span><span class="cx"> void registerDatabaseConnection(IDBDatabase&);
</span><span class="cx"> void unregisterDatabaseConnection(IDBDatabase&);
</span><span class="cx">
</span><del>- RefPtr<IDBOpenDBRequest> takeIDBOpenDBRequest(IDBOpenDBRequest&);
-
</del><span class="cx"> void forgetActiveOperations(const Vector<RefPtr<TransactionOperation>>&);
</span><ins>+ void forgetActivityForCurrentThread();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void completeOpenDBRequest(const IDBResultData&);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (201389 => 201390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-05-25 18:02:13 UTC (rev 201389)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-05-25 18:20:26 UTC (rev 201390)
</span><span class="lines">@@ -132,6 +132,14 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+void WorkerGlobalScope::stopIndexedDatabase()
+{
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
+ ASSERT(m_connectionProxy);
+ m_connectionProxy->forgetActivityForCurrentThread();
+#endif
+}
</ins><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> WorkerLocation& WorkerGlobalScope::location() const
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (201389 => 201390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-05-25 18:02:13 UTC (rev 201389)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-05-25 18:20:26 UTC (rev 201390)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> IDBClient::IDBConnectionProxy* idbConnectionProxy() final;
</span><ins>+ void stopIndexedDatabase();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool shouldBypassMainWorldContentSecurityPolicy() const final { return m_shouldBypassMainWorldContentSecurityPolicy; }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (201389 => 201390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2016-05-25 18:02:13 UTC (rev 201389)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2016-05-25 18:20:26 UTC (rev 201390)
</span><span class="lines">@@ -208,6 +208,10 @@
</span><span class="cx"> m_runLoop.postTaskAndTerminate({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext& context ) {
</span><span class="cx"> WorkerGlobalScope& workerGlobalScope = downcast<WorkerGlobalScope>(context);
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+ workerGlobalScope.stopIndexedDatabase();
+#endif
+
</ins><span class="cx"> workerGlobalScope.stopActiveDOMObjects();
</span><span class="cx"> workerGlobalScope.notifyObserversOfStop();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>