[webkit-changes] [282550] releases/WebKitGTK/webkit-2.32/Source/WebCore

Thu, 16 Sep 2021 04:15:41 -0700

Title: [282550] releases/WebKitGTK/webkit-2.32/Source/WebCore
Revision
282550
Author
[email protected]
Date
2021-09-16 04:14:49 -0700 (Thu, 16 Sep 2021)

Log Message

Merge r279960 - Use WeakPtr with UniqueIDBDatabaseConnection
<rdar://79447808> and https://bugs.webkit.org/show_bug.cgi?id=227969

Reviewed by Geoff Garen.

No new tests possible.

Noticed this raw ptr which was raw to break a ref cycle.
WeakPtr works better.

* Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::~UniqueIDBDatabaseTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::databaseConnection):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::abort):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::abortWithoutCallback):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::commit):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::createObjectStore):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteObjectStore):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::renameObjectStore):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::clearObjectStore):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::createIndex):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteIndex):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::renameIndex):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::putOrAdd):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::getRecord):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::getAllRecords):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::getCount):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteRecord):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::openCursor):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::iterateCursor):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::objectStoreIdentifiers):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::didActivateInBackingStore):
* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::databaseConnection): Deleted.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (282549 => 282550)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-09-16 11:12:54 UTC (rev 282549)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-09-16 11:14:49 UTC (rev 282550)
@@ -1,5 +1,44 @@
 2021-07-15  Brady Eidson  <[email protected]>
 
+        Use WeakPtr with UniqueIDBDatabaseConnection
+        <rdar://79447808> and https://bugs.webkit.org/show_bug.cgi?id=227969
+
+        Reviewed by Geoff Garen.
+
+        No new tests possible.
+        
+        Noticed this raw ptr which was raw to break a ref cycle.
+        WeakPtr works better.
+
+        * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
+        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::~UniqueIDBDatabaseTransaction):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::databaseConnection):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::abort):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::abortWithoutCallback):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::commit):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::createObjectStore):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteObjectStore):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::renameObjectStore):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::clearObjectStore):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::createIndex):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteIndex):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::renameIndex):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::putOrAdd):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::getRecord):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::getAllRecords):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::getCount):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteRecord):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::openCursor):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::iterateCursor):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::objectStoreIdentifiers):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::didActivateInBackingStore):
+        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::databaseConnection): Deleted.
+
+2021-07-15  Brady Eidson  <[email protected]>
+
         MemoryIDBBackingStore cleanup.
         <rdar://79497380> and https://bugs.webkit.org/show_bug.cgi?id=227993

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h (282549 => 282550)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h	2021-09-16 11:12:54 UTC (rev 282549)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h	2021-09-16 11:14:49 UTC (rev 282550)
@@ -46,7 +46,7 @@
 class UniqueIDBDatabase;
 class UniqueIDBDatabaseTransaction;
 
-class UniqueIDBDatabaseConnection : public RefCounted<UniqueIDBDatabaseConnection>, public Identified<UniqueIDBDatabaseConnection> {
+class UniqueIDBDatabaseConnection : public RefCounted<UniqueIDBDatabaseConnection>, public Identified<UniqueIDBDatabaseConnection>, public CanMakeWeakPtr<UniqueIDBDatabaseConnection> {
 public:
     static Ref<UniqueIDBDatabaseConnection> create(UniqueIDBDatabase&, ServerOpenDBRequest&);

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (282549 => 282550)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp	2021-09-16 11:12:54 UTC (rev 282549)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp	2021-09-16 11:14:49 UTC (rev 282550)
@@ -43,23 +43,29 @@
 }
 
 UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction(UniqueIDBDatabaseConnection& connection, const IDBTransactionInfo& info)
-    : m_databaseConnection(&connection)
+    : m_databaseConnection(makeWeakPtr(&connection))
     , m_transactionInfo(info)
 {
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     if (m_transactionInfo.mode() == IDBTransactionMode::Versionchange)
         m_originalDatabaseInfo = makeUnique<IDBDatabaseInfo>(database->info());
 
-    m_databaseConnection->server()->registerTransaction(*this);
+    databaseConnection().server()->registerTransaction(*this);
 }
 
 UniqueIDBDatabaseTransaction::~UniqueIDBDatabaseTransaction()
 {
-    m_databaseConnection->server()->unregisterTransaction(*this);
+    databaseConnection().server()->unregisterTransaction(*this);
 }
 
+UniqueIDBDatabaseConnection& UniqueIDBDatabaseTransaction::databaseConnection()
+{
+    RELEASE_ASSERT(m_databaseConnection);
+    return *m_databaseConnection;
+}
+
 IDBDatabaseInfo* UniqueIDBDatabaseTransaction::originalDatabaseInfo() const
 {
     ASSERT(m_transactionInfo.mode() == IDBTransactionMode::Versionchange);
@@ -70,13 +76,13 @@
 {
     LOG(IndexedDB, "UniqueIDBDatabaseTransaction::abort");
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     database->abortTransaction(*this, [this](auto& error) {
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::abort (callback)");
 
-        m_databaseConnection->didAbortTransaction(*this, error);
+        databaseConnection().didAbortTransaction(*this, error);
     });
 }
 
@@ -84,7 +90,7 @@
 {
     LOG(IndexedDB, "UniqueIDBDatabaseTransaction::abortWithoutCallback");
 
-    m_databaseConnection->abortTransactionWithoutCallback(*this);
+    databaseConnection().abortTransactionWithoutCallback(*this);
 }
 
 bool UniqueIDBDatabaseTransaction::isVersionChange() const
@@ -101,12 +107,12 @@
 {
     LOG(IndexedDB, "UniqueIDBDatabaseTransaction::commit");
 
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
 
     database->commitTransaction(*this, [this](auto& error) {
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::commit (callback)");
 
-        m_databaseConnection->didCommitTransaction(*this, error);
+        databaseConnection().didCommitTransaction(*this, error);
     });
 }
 
@@ -117,7 +123,7 @@
     ASSERT(isVersionChange());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
 
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     database->createObjectStore(*this, info, [this, requestData](auto& error) {
@@ -124,9 +130,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::createObjectStore (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didCreateObjectStore(IDBResultData::createObjectStoreSuccess(requestData.requestIdentifier()));
+            databaseConnection().didCreateObjectStore(IDBResultData::createObjectStoreSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didCreateObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didCreateObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -136,8 +142,8 @@
 
     ASSERT(isVersionChange());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
-    
-    auto database = m_databaseConnection->database();
+
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     database->deleteObjectStore(*this, objectStoreName, [this, requestData](const IDBError& error) {
@@ -144,9 +150,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::deleteObjectStore (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didDeleteObjectStore(IDBResultData::deleteObjectStoreSuccess(requestData.requestIdentifier()));
+            databaseConnection().didDeleteObjectStore(IDBResultData::deleteObjectStoreSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didDeleteObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didDeleteObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -157,7 +163,7 @@
     ASSERT(isVersionChange());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
 
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     database->renameObjectStore(*this, objectStoreIdentifier, newName, [this, requestData](auto& error) {
@@ -164,9 +170,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::renameObjectStore (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didRenameObjectStore(IDBResultData::renameObjectStoreSuccess(requestData.requestIdentifier()));
+            databaseConnection().didRenameObjectStore(IDBResultData::renameObjectStoreSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didRenameObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didRenameObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -176,7 +182,7 @@
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
 
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     database->clearObjectStore(*this, objectStoreIdentifier, [this, requestData](auto& error) {
@@ -183,9 +189,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::clearObjectStore (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didClearObjectStore(IDBResultData::clearObjectStoreSuccess(requestData.requestIdentifier()));
+            databaseConnection().didClearObjectStore(IDBResultData::clearObjectStoreSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didClearObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didClearObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -196,7 +202,7 @@
     ASSERT(isVersionChange());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
 
     database->createIndex(*this, info, [this, requestData](auto& error) {
@@ -203,9 +209,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::createIndex (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didCreateIndex(IDBResultData::createIndexSuccess(requestData.requestIdentifier()));
+            databaseConnection().didCreateIndex(IDBResultData::createIndexSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didCreateIndex(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didCreateIndex(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -216,7 +222,7 @@
     ASSERT(isVersionChange());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
 
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->deleteIndex(*this, objectStoreIdentifier, indexName, [this, requestData](auto& error) {
@@ -223,9 +229,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::createIndex (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didDeleteIndex(IDBResultData::deleteIndexSuccess(requestData.requestIdentifier()));
+            databaseConnection().didDeleteIndex(IDBResultData::deleteIndexSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didDeleteIndex(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didDeleteIndex(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -235,8 +241,8 @@
 
     ASSERT(isVersionChange());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
-    
-    auto database = m_databaseConnection->database();
+
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->renameIndex(*this, objectStoreIdentifier, indexIdentifier, newName, [this, requestData](auto& error) {
@@ -243,9 +249,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::renameIndex (callback)");
 
         if (error.isNull())
-            m_databaseConnection->didRenameIndex(IDBResultData::renameIndexSuccess(requestData.requestIdentifier()));
+            databaseConnection().didRenameIndex(IDBResultData::renameIndexSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->didRenameIndex(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().didRenameIndex(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -257,7 +263,7 @@
     ASSERT(!isReadOnly());
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->putOrAdd(requestData, keyData, value, overwriteMode, [this, requestData](auto& error, const IDBKeyData& key) {
@@ -264,9 +270,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::putOrAdd (callback)");
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didPutOrAdd(IDBResultData::putOrAddSuccess(requestData.requestIdentifier(), key));
+            databaseConnection().connectionToClient().didPutOrAdd(IDBResultData::putOrAddSuccess(requestData.requestIdentifier(), key));
         else
-            m_databaseConnection->connectionToClient().didPutOrAdd(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didPutOrAdd(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -276,7 +282,7 @@
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
 
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->getRecord(requestData, getRecordData, [this, requestData](auto& error, const IDBGetResult& result) {
@@ -283,9 +289,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::getRecord (callback)");
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didGetRecord(IDBResultData::getRecordSuccess(requestData.requestIdentifier(), result));
+            databaseConnection().connectionToClient().didGetRecord(IDBResultData::getRecordSuccess(requestData.requestIdentifier(), result));
         else
-            m_databaseConnection->connectionToClient().didGetRecord(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didGetRecord(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -295,7 +301,7 @@
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->getAllRecords(requestData, getAllRecordsData, [this, requestData](auto& error, const IDBGetAllResult& result) {
@@ -302,9 +308,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::getAllRecords (callback)");
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didGetAllRecords(IDBResultData::getAllRecordsSuccess(requestData.requestIdentifier(), result));
+            databaseConnection().connectionToClient().didGetAllRecords(IDBResultData::getAllRecordsSuccess(requestData.requestIdentifier(), result));
         else
-            m_databaseConnection->connectionToClient().didGetAllRecords(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didGetAllRecords(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -314,7 +320,7 @@
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->getCount(requestData, keyRangeData, [this, requestData](auto& error, uint64_t count) {
@@ -321,9 +327,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::getCount (callback)");
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didGetCount(IDBResultData::getCountSuccess(requestData.requestIdentifier(), count));
+            databaseConnection().connectionToClient().didGetCount(IDBResultData::getCountSuccess(requestData.requestIdentifier(), count));
         else
-            m_databaseConnection->connectionToClient().didGetCount(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didGetCount(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -333,7 +339,7 @@
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->deleteRecord(requestData, keyRangeData, [this, requestData](auto& error) {
@@ -340,9 +346,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::deleteRecord (callback)");
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didDeleteRecord(IDBResultData::deleteRecordSuccess(requestData.requestIdentifier()));
+            databaseConnection().connectionToClient().didDeleteRecord(IDBResultData::deleteRecordSuccess(requestData.requestIdentifier()));
         else
-            m_databaseConnection->connectionToClient().didDeleteRecord(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didDeleteRecord(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -352,7 +358,7 @@
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
     
-    auto database = m_databaseConnection->database();
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->openCursor(requestData, info, [this, requestData](auto& error, const IDBGetResult& result) {
@@ -359,9 +365,9 @@
         LOG(IndexedDB, "UniqueIDBDatabaseTransaction::openCursor (callback)");
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didOpenCursor(IDBResultData::openCursorSuccess(requestData.requestIdentifier(), result));
+            databaseConnection().connectionToClient().didOpenCursor(IDBResultData::openCursorSuccess(requestData.requestIdentifier(), result));
         else
-            m_databaseConnection->connectionToClient().didOpenCursor(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didOpenCursor(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -370,8 +376,8 @@
     LOG(IndexedDB, "UniqueIDBDatabaseTransaction::iterateCursor");
 
     ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
-    
-    auto database = m_databaseConnection->database();
+
+    auto database = databaseConnection().database();
     ASSERT(database);
     
     database->iterateCursor(requestData, data, [this, requestData, option = data.option](auto& error, const IDBGetResult& result) {
@@ -381,9 +387,9 @@
             return;
 
         if (error.isNull())
-            m_databaseConnection->connectionToClient().didIterateCursor(IDBResultData::iterateCursorSuccess(requestData.requestIdentifier(), result));
+            databaseConnection().connectionToClient().didIterateCursor(IDBResultData::iterateCursorSuccess(requestData.requestIdentifier(), result));
         else
-            m_databaseConnection->connectionToClient().didIterateCursor(IDBResultData::error(requestData.requestIdentifier(), error));
+            databaseConnection().connectionToClient().didIterateCursor(IDBResultData::error(requestData.requestIdentifier(), error));
     });
 }
 
@@ -392,7 +398,7 @@
     if (!m_objectStoreIdentifiers.isEmpty())
         return m_objectStoreIdentifiers;
 
-    auto& info = m_databaseConnection->database()->info();
+    auto& info = databaseConnection().database()->info();
     for (const auto& objectStoreName : info.objectStoreNames()) {
         auto objectStoreInfo = info.infoForExistingObjectStore(objectStoreName);
         ASSERT(objectStoreInfo);
@@ -410,7 +416,7 @@
 {
     LOG(IndexedDB, "UniqueIDBDatabaseTransaction::didActivateInBackingStore");
 
-    m_databaseConnection->connectionToClient().didStartTransaction(m_transactionInfo.identifier(), error);
+    databaseConnection().connectionToClient().didStartTransaction(m_transactionInfo.identifier(), error);
 }
 
 } // namespace IDBServer

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h (282549 => 282550)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h	2021-09-16 11:12:54 UTC (rev 282549)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h	2021-09-16 11:14:49 UTC (rev 282550)
@@ -58,7 +58,7 @@
 
     ~UniqueIDBDatabaseTransaction();
 
-    UniqueIDBDatabaseConnection& databaseConnection() { return *m_databaseConnection; }
+    UniqueIDBDatabaseConnection& databaseConnection();
     const IDBTransactionInfo& info() const { return m_transactionInfo; }
     bool isVersionChange() const;
     bool isReadOnly() const;
@@ -94,7 +94,7 @@
 private:
     UniqueIDBDatabaseTransaction(UniqueIDBDatabaseConnection&, const IDBTransactionInfo&);
 
-    UniqueIDBDatabaseConnection* m_databaseConnection;
+    WeakPtr<UniqueIDBDatabaseConnection> m_databaseConnection;
     IDBTransactionInfo m_transactionInfo;
 
     std::unique_ptr<IDBDatabaseInfo> m_originalDatabaseInfo;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to