Changeset 248597 in webkit

Timestamp:

Aug 13, 2019 10:08:54 AM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Make sure UniqueIDBDatabaseConnection unregister itself from IDBServer
​https://bugs.webkit.org/show_bug.cgi?id=200650
<rdar://problem/54236010>

Reviewed by Youenn Fablet.

We register UniqueIDBDatabaseConnection unconditionally to IDBServer but fail to unregister if UniqueIDBDatabase
of UniqueIDBDatabaseConnection is gone.

• Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:

(WebCore::IDBServer::UniqueIDBDatabaseConnection::UniqueIDBDatabaseConnection):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::~UniqueIDBDatabaseConnection):

• Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:

(WebCore::IDBServer::UniqueIDBDatabaseConnection::server):

• Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:

(WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::~UniqueIDBDatabaseTransaction):

• Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp (modified) (2 diffs)
• Modules/indexeddb/server/UniqueIDBDatabaseConnection.h (modified) (2 diffs)
• Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (modified) (2 diffs)
• Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-13  Sihui Liu  <sihui_liu@apple.com>
+
+        Make sure UniqueIDBDatabaseConnection unregister itself from IDBServer
+        https://bugs.webkit.org/show_bug.cgi?id=200650
+        <rdar://problem/54236010>
+
+        Reviewed by Youenn Fablet.
+
+        We register UniqueIDBDatabaseConnection unconditionally to IDBServer but fail to unregister if UniqueIDBDatabase
+        of UniqueIDBDatabaseConnection is gone.
+
+        * Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabaseConnection::UniqueIDBDatabaseConnection):
+        (WebCore::IDBServer::UniqueIDBDatabaseConnection::~UniqueIDBDatabaseConnection):
+        * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
+        (WebCore::IDBServer::UniqueIDBDatabaseConnection::server):
+        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::~UniqueIDBDatabaseTransaction):
+        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
+
 2019-08-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp

@@ -46 +46 @@
 UniqueIDBDatabaseConnection::UniqueIDBDatabaseConnection(UniqueIDBDatabase& database, ServerOpenDBRequest& request)
     : m_database(makeWeakPtr(database))
+    , m_server(makeWeakPtr(m_database->server()))
     , m_connectionToClient(request.connection())
     , m_openRequestIdentifier(request.requestData().requestIdentifier())
 {
-    m_database->server().registerDatabaseConnection(*this);
+    m_server->registerDatabaseConnection(*this);
     m_connectionToClient->registerDatabaseConnection(*this);
 }
@@ -55 +56 @@
 UniqueIDBDatabaseConnection::~UniqueIDBDatabaseConnection()
 {
-    if (m_database)
-        m_database->server().unregisterDatabaseConnection(*this);
+    if (m_server)
+        m_server->unregisterDatabaseConnection(*this);
     m_connectionToClient->unregisterDatabaseConnection(*this);
 }

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h

@@ -55 +55 @@
     const IDBResourceIdentifier& openRequestIdentifier() { return m_openRequestIdentifier; }
     UniqueIDBDatabase* database() { return m_database.get(); }
+    IDBServer* server() { return m_server.get(); }
     IDBConnectionToClient& connectionToClient() { return m_connectionToClient; }
 
@@ -91 +92 @@
 
     WeakPtr<UniqueIDBDatabase> m_database;
+    WeakPtr<IDBServer> m_server;
     Ref<IDBConnectionToClient> m_connectionToClient;
     IDBResourceIdentifier m_openRequestIdentifier;

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp

@@ -54 +54 @@
         m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(database->info());
 
-    auto& server = database->server();
-    m_server = makeWeakPtr(server);
-    server.registerTransaction(*this);
+    if (auto* server = m_databaseConnection->server())
+        server->registerTransaction(*this);
 }
 
@@ -64 +63 @@
         database->transactionDestroyed(*this);
 
-    if (m_server)
-        m_server->unregisterTransaction(*this);
+    if (auto* server = m_databaseConnection->server())
+        server->unregisterTransaction(*this);
 }
 

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h

@@ -102 +102 @@
     Ref<UniqueIDBDatabaseConnection> m_databaseConnection;
     IDBTransactionInfo m_transactionInfo;
-    WeakPtr<IDBServer> m_server;
 
     std::unique_ptr<IDBDatabaseInfo> m_originalDatabaseInfo;