[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [259316] trunk/Source
From:       sihui_liu () apple ! com
Date:       2020-03-31 22:19:25
Message-ID: 20200331221925.EC94F10051CD () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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>[259316] trunk/Source</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/259316">259316</a></dd> \
<dt>Author</dt> <dd>sihui_liu@apple.com</dd> <dt>Date</dt> <dd>2020-03-31 15:19:25 \
-0700 (Tue, 31 Mar 2020)</dd> </dl>

<h3>Log Message</h3>
<pre>IndexedDB: destroy WebIDBServer when session is removed in network process
https://bugs.webkit.org/show_bug.cgi?id=209606
&lt;rdar://problem/59310081&gt;

Reviewed by Geoffrey Garen.

Source/WebCore:

Rename immediateCloseForUserDelete to immediateClose as we now use it in destructor \
of IDBServer to make sure everything in database finishes correctly.

* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::~IDBServer):
(WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesModifiedSince):
(WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesForOrigins):
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::immediateClose):
(WebCore::IDBServer::UniqueIDBDatabase::immediateCloseForUserDelete): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:

Source/WebKit:

Tested manually to verify WebIDBServer is removed and its thread ends when session is \
removed.

* NetworkProcess/IndexedDB/WebIDBServer.cpp:
(WebKit::WebIDBServer::~WebIDBServer):
(WebKit::WebIDBServer::addConnection):
(WebKit::WebIDBServer::removeConnection):
(WebKit::WebIDBServer::close):
* NetworkProcess/IndexedDB/WebIDBServer.h:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::destroySession):
(WebKit::NetworkProcess::connectionToWebProcessClosed):

Source/WTF:

Add function to kill CrossThreadTaskHandler and make thread finish. Also add a \
callback to be called before thread finishes.

* wtf/CrossThreadTaskHandler.cpp:
(WTF::CrossThreadTaskHandler::CrossThreadTaskHandler):
(WTF::CrossThreadTaskHandler::setCompletionCallback):
(WTF::CrossThreadTaskHandler::kill):
* wtf/CrossThreadTaskHandler.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCrossThreadTaskHandlercpp">trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp</a></li>
 <li><a href="#trunkSourceWTFwtfCrossThreadTaskHandlerh">trunk/Source/WTF/wtf/CrossThreadTaskHandler.h</a></li>
 <li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
 <li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
 <li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
 <li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessIndexedDBWebIDBServercpp">trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp</a></li>
 <li><a href="#trunkSourceWebKitNetworkProcessIndexedDBWebIDBServerh">trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h</a></li>
 <li><a href="#trunkSourceWebKitNetworkProcessNetworkProcesscpp">trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (259315 => 259316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog	2020-03-31 22:09:46 UTC (rev \
                259315)
+++ trunk/Source/WTF/ChangeLog	2020-03-31 22:19:25 UTC (rev 259316)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2020-03-31  Sihui Liu  &lt;sihui_liu@apple.com&gt;
+
+        IndexedDB: destroy WebIDBServer when session is removed in network process
+        https://bugs.webkit.org/show_bug.cgi?id=209606
+        &lt;rdar://problem/59310081&gt;
+
+        Reviewed by Geoffrey Garen.
+
+        Add function to kill CrossThreadTaskHandler and make thread finish. Also add \
a callback to be called before  +        thread finishes.
+
+        * wtf/CrossThreadTaskHandler.cpp:
+        (WTF::CrossThreadTaskHandler::CrossThreadTaskHandler):
+        (WTF::CrossThreadTaskHandler::setCompletionCallback):
+        (WTF::CrossThreadTaskHandler::kill):
+        * wtf/CrossThreadTaskHandler.h:
+
</ins><span class="cx"> 2020-03-30  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix &quot;Dead nested assignment&quot; static \
analyzer warning in monthFromDayInYear() </span></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadTaskHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp \
(259315 => 259316)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp	2020-03-31 \
                22:09:46 UTC (rev 259315)
+++ trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp	2020-03-31 22:19:25 UTC (rev \
259316) </span><span class="lines">@@ -37,6 +37,9 @@
</span><span class="cx">     Locker&lt;Lock&gt; locker(m_taskThreadCreationLock);
</span><span class="cx">     Thread::create(threadName, [this] {
</span><span class="cx">         taskRunLoop();
</span><ins>+
+        if (m_completionCallback)
+            m_completionCallback();
</ins><span class="cx">     })-&gt;detach();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -89,4 +92,15 @@
</span><span class="cx">         task-&gt;performTask();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void CrossThreadTaskHandler::setCompletionCallback(Function&lt;void \
()&gt;&amp;&amp; completionCallback) +{
+    m_completionCallback = WTFMove(completionCallback);
+}
+
+void CrossThreadTaskHandler::kill()
+{
+    m_taskQueue.kill();
+    m_taskReplyQueue.kill();
+}
+
</ins><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadTaskHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CrossThreadTaskHandler.h \
(259315 => 259316)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadTaskHandler.h	2020-03-31 \
                22:09:46 UTC (rev 259315)
+++ trunk/Source/WTF/wtf/CrossThreadTaskHandler.h	2020-03-31 22:19:25 UTC (rev \
259316) </span><span class="lines">@@ -46,6 +46,9 @@
</span><span class="cx">     WTF_EXPORT_PRIVATE void \
postTask(CrossThreadTask&amp;&amp;); </span><span class="cx">     WTF_EXPORT_PRIVATE \
void postTaskReply(CrossThreadTask&amp;&amp;); </span><span class="cx"> 
</span><ins>+    WTF_EXPORT_PRIVATE void kill();
+    WTF_EXPORT_PRIVATE void setCompletionCallback(Function&lt;void \
()&gt;&amp;&amp;); +
</ins><span class="cx"> private:
</span><span class="cx">     void handleTaskRepliesOnMainThread();
</span><span class="cx">     void taskRunLoop();
</span><span class="lines">@@ -58,6 +61,8 @@
</span><span class="cx"> 
</span><span class="cx">     CrossThreadQueue&lt;CrossThreadTask&gt; m_taskQueue;
</span><span class="cx">     CrossThreadQueue&lt;CrossThreadTask&gt; \
m_taskReplyQueue; </span><ins>+
+    Function&lt;void ()&gt; m_completionCallback;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (259315 => \
259316)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog	2020-03-31 22:09:46 UTC (rev \
                259315)
+++ trunk/Source/WebCore/ChangeLog	2020-03-31 22:19:25 UTC (rev 259316)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-03-31  Sihui Liu  &lt;sihui_liu@apple.com&gt;
+
+        IndexedDB: destroy WebIDBServer when session is removed in network process
+        https://bugs.webkit.org/show_bug.cgi?id=209606
+        &lt;rdar://problem/59310081&gt;
+
+        Reviewed by Geoffrey Garen.
+
+        Rename immediateCloseForUserDelete to immediateClose as we now use it in \
destructor of IDBServer to make sure  +        everything in database finishes \
correctly. +
+        * Modules/indexeddb/server/IDBServer.cpp:
+        (WebCore::IDBServer::IDBServer::~IDBServer):
+        (WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesModifiedSince):
+        (WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesForOrigins):
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::immediateClose):
+        (WebCore::IDBServer::UniqueIDBDatabase::immediateCloseForUserDelete): \
Deleted. +        * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
</ins><span class="cx"> 2020-03-31  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Regression(r253357) DeviceMotionEvent acceleration \
and rotationRate are null </span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (259315 => 259316)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp	2020-03-31 22:09:46 UTC \
                (rev 259315)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp	2020-03-31 22:19:25 \
UTC (rev 259316) </span><span class="lines">@@ -60,6 +60,9 @@
</span><span class="cx"> IDBServer::~IDBServer()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!isMainThread());
</span><ins>+
+    for (auto&amp; database : m_uniqueIDBDatabaseMap.values())
+        database-&gt;immediateClose();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void \
IDBServer::registerConnection(IDBConnectionToClient&amp; connection) </span><span \
class="lines">@@ -544,7 +547,7 @@ </span><span class="cx"> 
</span><span class="cx">     HashSet&lt;UniqueIDBDatabase*&gt; openDatabases;
</span><span class="cx">     for (auto&amp; database : \
m_uniqueIDBDatabaseMap.values()) </span><del>-        \
database-&gt;immediateCloseForUserDelete(); </del><ins>+        \
database-&gt;immediateClose(); </ins><span class="cx"> 
</span><span class="cx">     m_uniqueIDBDatabaseMap.clear();
</span><span class="cx"> 
</span><span class="lines">@@ -571,7 +574,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     for (auto&amp; database : openDatabases) {
</span><del>-        database-&gt;immediateCloseForUserDelete();
</del><ins>+        database-&gt;immediateClose();
</ins><span class="cx">         \
m_uniqueIDBDatabaseMap.remove(database-&gt;identifier()); </span><span class="cx">    \
} </span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (259315 => \
259316)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2020-03-31 \
                22:09:46 UTC (rev 259315)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2020-03-31 \
22:19:25 UTC (rev 259316) </span><span class="lines">@@ -1124,9 +1124,9 @@
</span><span class="cx">         request.connection().didDeleteDatabase(result);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void UniqueIDBDatabase::immediateCloseForUserDelete()
</del><ins>+void UniqueIDBDatabase::immediateClose()
</ins><span class="cx"> {
</span><del>-    LOG(IndexedDB, \
&quot;UniqueIDBDatabase::immediateCloseForUserDelete&quot;); </del><ins>+    \
LOG(IndexedDB, &quot;UniqueIDBDatabase::immediateClose&quot;); </ins><span \
class="cx">  </span><span class="cx">     // Error out all transactions.
</span><span class="cx">     // Pending transactions must be cleared before \
in-progress transactions, </span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (259315 => \
259316)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h	2020-03-31 22:09:46 \
                UTC (rev 259315)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h	2020-03-31 \
22:19:25 UTC (rev 259316) </span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">     void \
enqueueTransaction(Ref&lt;UniqueIDBDatabaseTransaction&gt;&amp;&amp;); </span><span \
class="cx">  </span><span class="cx">     void \
handleDelete(IDBConnectionToClient&amp;, const IDBRequestData&amp;); </span><del>-    \
void immediateCloseForUserDelete(); </del><ins>+    void immediateClose();
</ins><span class="cx"> 
</span><span class="cx">     void abortActiveTransactions();
</span><span class="cx">     bool tryClose();
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (259315 => \
259316)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog	2020-03-31 22:09:46 UTC (rev \
                259315)
+++ trunk/Source/WebKit/ChangeLog	2020-03-31 22:19:25 UTC (rev 259316)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-03-31  Sihui Liu  &lt;sihui_liu@apple.com&gt;
+
+        IndexedDB: destroy WebIDBServer when session is removed in network process
+        https://bugs.webkit.org/show_bug.cgi?id=209606
+        &lt;rdar://problem/59310081&gt;
+
+        Reviewed by Geoffrey Garen.
+
+        Tested manually to verify WebIDBServer is removed and its thread ends when \
session is removed. +
+        * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+        (WebKit::WebIDBServer::~WebIDBServer):
+        (WebKit::WebIDBServer::addConnection):
+        (WebKit::WebIDBServer::removeConnection):
+        (WebKit::WebIDBServer::close):
+        * NetworkProcess/IndexedDB/WebIDBServer.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::destroySession):
+        (WebKit::NetworkProcess::connectionToWebProcessClosed):
+
</ins><span class="cx"> 2020-03-31  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Regression(r253357) DeviceMotionEvent acceleration \
and rotationRate are null </span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessIndexedDBWebIDBServercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp (259315 => 259316)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp	2020-03-31 22:09:46 UTC \
                (rev 259315)
+++ trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp	2020-03-31 22:19:25 \
UTC (rev 259316) </span><span class="lines">@@ -53,7 +53,12 @@
</span><span class="cx">     });
</span><span class="cx">     semaphore.wait();
</span><span class="cx"> }
</span><del>-    
</del><ins>+
+WebIDBServer::~WebIDBServer()
+{
+    ASSERT(RunLoop::isMain());
+}
+
</ins><span class="cx"> void \
WebIDBServer::closeAndDeleteDatabasesModifiedSince(WallTime modificationTime, \
CompletionHandler&lt;void()&gt;&amp;&amp; callback) </span><span class="cx"> {
</span><span class="cx">     ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -335,6 +340,7 @@
</span><span class="cx">         LockHolder locker(m_server-&gt;lock());
</span><span class="cx">         \
m_server-&gt;registerConnection(iter-&gt;value-&gt;connectionToClient()); \
</span><span class="cx">     }); </span><ins>+    m_connections.add(&amp;connection);
</ins><span class="cx">     \
connection.addThreadMessageReceiver(Messages::WebIDBServer::messageReceiverName(), \
this); </span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -342,6 +348,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(RunLoop::isMain());
</span><span class="cx"> 
</span><ins>+    m_connections.remove(&amp;connection);
</ins><span class="cx">     \
connection.removeThreadMessageReceiver(Messages::WebIDBServer::messageReceiverName());
 </span><span class="cx">     postTask([this, protectedThis = makeRef(*this), \
connectionID = connection.uniqueID()] { </span><span class="cx">         auto \
connection = m_connectionMap.take(connectionID); </span><span class="lines">@@ -365,5 \
+372,26 @@ </span><span class="cx">     \
CrossThreadTaskHandler::postTask(CrossThreadTask(WTFMove(task))); </span><span \
class="cx"> } </span><span class="cx"> 
</span><ins>+void WebIDBServer::close()
+{
+    ASSERT(RunLoop::isMain());
+
+    // Remove the references held by IPC::Connection.
+    for (auto* connection : m_connections)
+        connection-&gt;removeThreadMessageReceiver(Messages::WebIDBServer::messageReceiverName());
 +
+    CrossThreadTaskHandler::setCompletionCallback([protectedThis = makeRef(*this)]() \
mutable { +        ASSERT(!RunLoop::isMain());
+        callOnMainRunLoop([protectedThis = WTFMove(protectedThis)]() mutable { });
+    });
+
+    postTask([this]() mutable {
+        m_connectionMap.clear();
+        m_server = nullptr;
+
+        CrossThreadTaskHandler::kill();
+    });
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessIndexedDBWebIDBServerh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h (259315 => 259316)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h	2020-03-31 22:09:46 UTC \
                (rev 259315)
+++ trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h	2020-03-31 22:19:25 \
UTC (rev 259316) </span><span class="lines">@@ -87,9 +87,11 @@
</span><span class="cx"> 
</span><span class="cx">     void didReceiveMessage(IPC::Connection&amp;, \
IPC::Decoder&amp;); </span><span class="cx">     void \
dispatchToThread(WTF::Function&lt;void()&gt;&amp;&amp;); </span><ins>+    void \
close(); </ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     WebIDBServer(PAL::SessionID, const String&amp; \
directory, WebCore::IDBServer::IDBServer::StorageQuotaManagerSpaceRequester&amp;&amp;);
 </span><ins>+    ~WebIDBServer();
</ins><span class="cx"> 
</span><span class="cx">     void postTask(WTF::Function&lt;void()&gt;&amp;&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -97,6 +99,7 @@
</span><span class="cx">     bool m_isSuspended { false };
</span><span class="cx"> 
</span><span class="cx">     HashMap&lt;IPC::Connection::UniqueID, \
std::unique_ptr&lt;WebIDBConnectionToClient&gt;&gt; m_connectionMap; </span><ins>+    \
HashSet&lt;IPC::Connection*&gt; m_connections; </ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (259315 => 259316)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2020-03-31 22:09:46 UTC (rev \
                259315)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2020-03-31 22:19:25 UTC \
(rev 259316) </span><span class="lines">@@ -591,6 +591,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     m_storageManagerSet-&gt;remove(sessionID);
</span><ins>+    if (auto webIDBServer = m_webIDBServers.take(sessionID))
+        webIDBServer-&gt;close();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(RESOURCE_LOAD_STATISTICS)
</span><span class="lines">@@ -2634,7 +2636,8 @@
</span><span class="cx"> void \
NetworkProcess::connectionToWebProcessClosed(IPC::Connection&amp; connection, \
PAL::SessionID sessionID) </span><span class="cx"> {
</span><span class="cx">     m_storageManagerSet-&gt;removeConnection(connection);
</span><del>-    webIDBServer(sessionID).removeConnection(connection);
</del><ins>+    if (auto* webIDBServer = m_webIDBServers.get(sessionID))
+        webIDBServer-&gt;removeConnection(connection);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> NetworkConnectionToWebProcess* \
NetworkProcess::webProcessConnection(ProcessIdentifier identifier) const \
</span></span></pre> </div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic