Changeset 243957 in webkit

Timestamp:

Apr 5, 2019 6:02:44 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

[iOS] Web process gets suspended while holding locked database files
​https://bugs.webkit.org/show_bug.cgi?id=196519
<rdar://problem/49531797>

Reviewed by Chris Dumez.

Source/WebCore:

Don't use DatabaseTracker singleton before it is initialized.

• Modules/webdatabase/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::isInitialized):

• Modules/webdatabase/DatabaseTracker.h:

Source/WebKit:

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::actualPrepareToSuspend):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/webdatabase/DatabaseTracker.cpp (modified) (1 diff)
• WebCore/Modules/webdatabase/DatabaseTracker.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-05  Sihui Liu  <sihui_liu@apple.com>
+
+        [iOS] Web process gets suspended while holding locked database files
+        https://bugs.webkit.org/show_bug.cgi?id=196519
+        <rdar://problem/49531797>
+
+        Reviewed by Chris Dumez.
+
+        Don't use DatabaseTracker singleton before it is initialized.
+
+        * Modules/webdatabase/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::isInitialized):
+        * Modules/webdatabase/DatabaseTracker.h:
+
 2019-04-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp

@@ -79 +79 @@
         return;
     staticTracker = new DatabaseTracker(databasePath);
+}
+
+bool DatabaseTracker::isInitialized()
+{
+    return !!staticTracker;
 }
 

trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h

@@ -60 +60 @@
 
     WEBCORE_EXPORT static DatabaseTracker& singleton();
+    WEBCORE_EXPORT static bool isInitialized();
     // This singleton will potentially be used from multiple worker threads and the page's context thread simultaneously.  To keep this safe, it's
     // currently using 4 locks.  In order to avoid deadlock when taking multiple locks, you must take them in the correct order:

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-05  Sihui Liu  <sihui_liu@apple.com>
+
+        [iOS] Web process gets suspended while holding locked database files
+        https://bugs.webkit.org/show_bug.cgi?id=196519
+        <rdar://problem/49531797>
+
+        Reviewed by Chris Dumez.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::actualPrepareToSuspend):
+
 2019-04-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -1468 +1468 @@
     m_webSQLiteDatabaseTracker = nullptr;
     SQLiteDatabase::setIsDatabaseOpeningForbidden(true);
-    DatabaseTracker::singleton().closeAllDatabases(CurrentQueryBehavior::Interrupt);
+    if (DatabaseTracker::isInitialized())
+        DatabaseTracker::singleton().closeAllDatabases(CurrentQueryBehavior::Interrupt);
     accessibilityProcessSuspendedNotification(true);
     updateFreezerStatus();