Title: [291654] branches/safari-613-branch/Source/WebCore
Revision
291654
Author
alanc...@apple.com
Date
2022-03-22 10:55:56 -0700 (Tue, 22 Mar 2022)

Log Message

Cherry-pick r290999. rdar://problem/89218299

    UniqueIDBDatabase::didFireVersionChangeEvent should capture identifier of UniqueIDBDatabaseConnection
    https://bugs.webkit.org/show_bug.cgi?id=236950
    rdar://problem/89218299

    Reviewed by Chris Dumez.

    * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
    (WebCore::IDBServer::UniqueIDBDatabase::didFireVersionChangeEvent):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (291653 => 291654)


--- branches/safari-613-branch/Source/WebCore/ChangeLog	2022-03-22 17:55:53 UTC (rev 291653)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog	2022-03-22 17:55:56 UTC (rev 291654)
@@ -1,5 +1,32 @@
 2022-03-21  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r290999. rdar://problem/89218299
+
+    UniqueIDBDatabase::didFireVersionChangeEvent should capture identifier of UniqueIDBDatabaseConnection
+    https://bugs.webkit.org/show_bug.cgi?id=236950
+    rdar://problem/89218299
+    
+    Reviewed by Chris Dumez.
+    
+    * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+    (WebCore::IDBServer::UniqueIDBDatabase::didFireVersionChangeEvent):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290999 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-08  Sihui Liu  <sihui_...@apple.com>
+
+            UniqueIDBDatabase::didFireVersionChangeEvent should capture identifier of UniqueIDBDatabaseConnection
+            https://bugs.webkit.org/show_bug.cgi?id=236950
+            rdar://problem/89218299
+
+            Reviewed by Chris Dumez.
+
+            * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+            (WebCore::IDBServer::UniqueIDBDatabase::didFireVersionChangeEvent):
+
+2022-03-21  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r290994. rdar://problem/89923867
 
     REGRESSION (r290853): CrashTracer: com.apple.WebKit.WebContent.Development at com.apple.WebCore: WebCore::FrameLoader::clear

Modified: branches/safari-613-branch/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (291653 => 291654)


--- branches/safari-613-branch/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2022-03-22 17:55:53 UTC (rev 291653)
+++ branches/safari-613-branch/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2022-03-22 17:55:56 UTC (rev 291654)
@@ -504,6 +504,7 @@
 
     ASSERT_UNUSED(requestIdentifier, m_currentOpenDBRequest->requestData().requestIdentifier() == requestIdentifier);
 
+    auto connectionIdentifier = connection.identifier();
     if (connectionClosedOnBehalfOfServer == IndexedDB::ConnectionClosedOnBehalfOfServer::Yes) {
         if (m_openDatabaseConnections.contains(&connection)) {
             clearTransactionsOnConnection(connection);
@@ -511,7 +512,7 @@
         }
     }
 
-    notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connection.identifier());
+    notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connectionIdentifier);
 }
 
 void UniqueIDBDatabase::openDBRequestCancelled(const IDBResourceIdentifier& requestIdentifier)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to