Changeset 201461 in webkit

Timestamp:

May 27, 2016, 12:45:42 PM (9 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: After closing a Netflix video, trying to watch it again fails.
<rdar://problem/25092473> and ​https://bugs.webkit.org/show_bug.cgi?id=158160

Reviewed by Alex Christensen.

Source/WebCore:

New APITest: IndexedDB.WebProcessKillIDBCleanup

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::stop):

• Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient): All active transactions need to be aborted

(without callback, since there's no connection to callback to).

(WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction):

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-1.html: Added.
• TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-2.html: Added.
• TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm: Added.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (8 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-1.html (added)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-2.html (added)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm (added)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2016-05-27  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: After closing a Netflix video, trying to watch it again fails.
+        <rdar://problem/25092473> and https://bugs.webkit.org/show_bug.cgi?id=158160
+
+        Reviewed by Alex Christensen.
+
+        New APITest: IndexedDB.WebProcessKillIDBCleanup
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::stop):
+        
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient): All active transactions need to be aborted
+          (without callback, since there's no connection to callback to).
+        (WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction):
+
 2016-05-27  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp ¶

@@ -329 +329 @@
 void IDBTransaction::stop()
 {
-    LOG(IndexedDB, "IDBTransaction::stop");
+    LOG(IndexedDB, "IDBTransaction::stop - %s", m_info.loggingString().utf8().data());
     ASSERT(currentThread() == m_database->originThreadID());
 

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp ¶

@@ -1242 +1242 @@
         m_pendingTransactions.swap(pendingTransactions);
 
+    Deque<RefPtr<UniqueIDBDatabaseTransaction>> transactionsToAbort;
+    for (auto& transaction : m_inProgressTransactions.values()) {
+        if (&transaction->databaseConnection() == &connection)
+            transactionsToAbort.append(transaction);
+    }
+
+    for (auto& transaction : transactionsToAbort)
+        transaction->abortWithoutCallback();
+
     if (m_currentOpenDBRequest)
         notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connection.identifier());
@@ -1405 +1414 @@
 {
     hadDeferredTransactions = false;
+
+    if (m_pendingTransactions.isEmpty())
+        return nullptr;
+
     if (!m_backingStoreSupportsSimultaneousTransactions && hasUnfinishedTransactions()) {
         LOG(IndexedDB, "UniqueIDBDatabase::takeNextRunnableTransaction - Backing store only supports 1 transaction, and we already have 1");

trunk/Tools/ChangeLog ¶

@@ +1 @@
+2016-05-27  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: After closing a Netflix video, trying to watch it again fails.
+        <rdar://problem/25092473> and https://bugs.webkit.org/show_bug.cgi?id=158160
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-1.html: Added.
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup-2.html: Added.
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm: Added.
+
 2016-05-27  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj ¶

@@ -69 +69 @@
                 51393E221523952D005F39C5 /* DOMWindowExtensionBasic_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51393E1D1523944A005F39C5 /* DOMWindowExtensionBasic_Bundle.cpp */; };
                 5142B2731517C8C800C32B19 /* ContextMenuCanCopyURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */; };
+                51714EB41CF8C78C004723C4 /* WebProcessKillIDBCleanup-1.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51714EB21CF8C761004723C4 /* WebProcessKillIDBCleanup-1.html */; };
+                51714EB51CF8C78C004723C4 /* WebProcessKillIDBCleanup-2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51714EB31CF8C761004723C4 /* WebProcessKillIDBCleanup-2.html */; };
+                51714EB81CF8CA17004723C4 /* WebProcessKillIDBCleanup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */; };
                 517E7E04151119C100D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 517E7E031511187500D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.html */; };
                 51B1EE8E1C80F5880064FB98 /* IndexedDBPersistence.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B1EE8D1C80F5880064FB98 /* IndexedDBPersistence.mm */; };
@@ -425 +428 @@
                         dstSubfolderSpec = 7;
                         files = (
+                                51714EB41CF8C78C004723C4 /* WebProcessKillIDBCleanup-1.html in Copy Resources */,
+                                51714EB51CF8C78C004723C4 /* WebProcessKillIDBCleanup-2.html in Copy Resources */,
                                 93CFA8671CEB9E38000565A8 /* autofocused-text-input.html in Copy Resources */,
                                 93625D271CD9741C006DC1F1 /* large-video-without-audio.html in Copy Resources */,
@@ -642 +647 @@
                 5142B2701517C88B00C32B19 /* ContextMenuCanCopyURL.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuCanCopyURL.mm; sourceTree = "<group>"; };
                 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ContextMenuCanCopyURL.html; sourceTree = "<group>"; };
+                51714EB21CF8C761004723C4 /* WebProcessKillIDBCleanup-1.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "WebProcessKillIDBCleanup-1.html"; sourceTree = "<group>"; };
+                51714EB31CF8C761004723C4 /* WebProcessKillIDBCleanup-2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "WebProcessKillIDBCleanup-2.html"; sourceTree = "<group>"; };
+                51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessKillIDBCleanup.mm; sourceTree = "<group>"; };
                 517E7DFB15110EA600D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryCachePruneWithinResourceLoadDelegate.mm; sourceTree = "<group>"; };
                 517E7E031511187500D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = MemoryCachePruneWithinResourceLoadDelegate.html; sourceTree = "<group>"; };
@@ -1044 +1052 @@
                                 A16F66B81C40E9E100BD4D24 /* Resources */,
                                 7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */,
+                                A1DF74301C41B65800A2F4D0 /* AlwaysRevalidatedURLSchemes.mm */,
                                 2DD355351BD08378005DF4A7 /* AutoLayoutIntegration.mm */,
                                 A13EBBAC1B87436F00097110 /* BundleParameters.mm */,
                                 A13EBBAE1B87436F00097110 /* BundleParametersPlugIn.mm */,
+                                1C2B817E1C891E4200A5529F /* CancelFontSubresource.mm */,
+                                1C2B81811C891EFA00A5529F /* CancelFontSubresourcePlugIn.mm */,
                                 A18AA8CC1C3FA218009B2B97 /* ContentFiltering.h */,
                                 A14FC5861B8991B600D107EB /* ContentFiltering.mm */,
@@ -1060 +1071 @@
                                 51CD1C6A1B38CE3600142CA5 /* ModalAlerts.mm */,
                                 1ABC3DED1899BE6D004F0626 /* Navigation.mm */,
-                                A1DF74301C41B65800A2F4D0 /* AlwaysRevalidatedURLSchemes.mm */,
                                 CEA6CF2219CCF5BD0064F5A7 /* OpenAndCloseWindow.mm */,
                                 C95501BE19AD2FAF0049BE3E /* Preferences.mm */,
@@ -1071 +1081 @@
                                 37BCA61B1B596BA9002012CA /* ShouldOpenExternalURLsInNewWindowActions.mm */,
                                 2D9A53AE1B31FA8D0074D5AA /* ShrinkToFit.mm */,
-                                93E943F11CD3E87E00AC08C2 /* VideoControlsManager.mm */,
                                 7CC3E1FA197E234100BE6252 /* UserContentController.mm */,
                                 7C882E031C80C624006BF731 /* UserContentWorld.mm */,
                                 7C882E041C80C624006BF731 /* UserContentWorldPlugIn.mm */,
                                 7C882E051C80C624006BF731 /* UserContentWorldProtocol.h */,
+                                93E943F11CD3E87E00AC08C2 /* VideoControlsManager.mm */,
                                 2D00065D1C1F58940088E6A7 /* WKPDFViewResizeCrash.mm */,
                                 0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
-                                1C2B817E1C891E4200A5529F /* CancelFontSubresource.mm */,
-                                1C2B81811C891EFA00A5529F /* CancelFontSubresourcePlugIn.mm */,
+                                51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */,
                         );
                         name = "WebKit2 Cocoa";
@@ -1162 +1171 @@
                                 51B1EE941C80FADD0064FB98 /* IndexedDBPersistence-1.html */,
                                 51B1EE951C80FADD0064FB98 /* IndexedDBPersistence-2.html */,
+                                51714EB21CF8C761004723C4 /* WebProcessKillIDBCleanup-1.html */,
+                                51714EB31CF8C761004723C4 /* WebProcessKillIDBCleanup-2.html */,
                                 93CFA8661CEB9DE1000565A8 /* autofocused-text-input.html */,
                                 936F727E1CD7D9D00068A0FB /* large-video-with-audio.html */,
@@ -1847 +1858 @@
                                 7CCE7EE21A411A9A00447C4C /* GetPIDAfterAbortedProcessLaunch.cpp in Sources */,
                                 7CCE7F351A411B8E00447C4C /* HashMap.cpp in Sources */,
+                                51714EB81CF8CA17004723C4 /* WebProcessKillIDBCleanup.mm in Sources */,
                                 7CCE7F361A411B8E00447C4C /* HashSet.cpp in Sources */,
                                 7CCE7EFA1A411AE600447C4C /* HitTestResultNodeHandle.cpp in Sources */,