Changeset 244257 in webkit

Timestamp:

Apr 15, 2019, 12:43:43 AM (7 years ago)

Author:

bshafiei@apple.com

Message:

Revert r244131. rdar://problem/49894388

Location:

branches/safari-607-branch/Source

Files:

• WebCore/Modules/webdatabase/DatabaseTracker.cpp (modified) (1 diff)
• WebCore/Modules/webdatabase/DatabaseTracker.h (modified) (1 diff)
• WebCore/platform/sql/SQLiteDatabase.cpp (modified) (2 diffs)
• WebCore/platform/sql/SQLiteDatabase.h (modified) (1 diff)
• WebCore/platform/sql/SQLiteDatabaseTracker.cpp (modified) (4 diffs)
• WebKit/Shared/WebSQLiteDatabaseTracker.cpp (modified) (1 diff)
• WebKit/Shared/WebSQLiteDatabaseTracker.h (modified) (1 diff)
• WebKit/WebProcess/WebProcess.cpp (modified) (6 diffs)
• WebKit/WebProcess/WebProcess.h (modified) (3 diffs)

branches/safari-607-branch/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp

@@ -81 +81 @@
 }
 
-bool DatabaseTracker::isInitialized()
-{
-    return !!staticTracker;
-}
-    
 DatabaseTracker& DatabaseTracker::singleton()
 {

branches/safari-607-branch/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:

branches/safari-607-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp

@@ -72 +72 @@
 }
 
-static bool isDatabaseOpeningForbidden = false;
-static Lock isDatabaseOpeningForbiddenMutex;
-
-void SQLiteDatabase::setIsDatabaseOpeningForbidden(bool isForbidden)
-{
-    std::lock_guard<Lock> lock(isDatabaseOpeningForbiddenMutex);
-    isDatabaseOpeningForbidden = isForbidden;
-}
-
 SQLiteDatabase::SQLiteDatabase() = default;
 
@@ -94 +85 @@
     close();
 
-    {
-        std::lock_guard<Lock> lock(isDatabaseOpeningForbiddenMutex);
-        m_openError = SQLiteFileSystem::openDatabase(filename, &m_db, forWebSQLDatabase);
-        if (m_openError != SQLITE_OK) {
-            m_openErrorMessage = m_db ? sqlite3_errmsg(m_db) : "sqlite_open returned null";
-            LOG_ERROR("SQLite database failed to load from %s\nCause - %s", filename.ascii().data(),
-                m_openErrorMessage.data());
-            sqlite3_close(m_db);
-            m_db = 0;
-            return false;
-        }
+    m_openError = SQLiteFileSystem::openDatabase(filename, &m_db, forWebSQLDatabase);
+    if (m_openError != SQLITE_OK) {
+        m_openErrorMessage = m_db ? sqlite3_errmsg(m_db) : "sqlite_open returned null";
+        LOG_ERROR("SQLite database failed to load from %s\nCause - %s", filename.ascii().data(),
+            m_openErrorMessage.data());
+        sqlite3_close(m_db);
+        m_db = 0;
+        return false;
     }
 

branches/safari-607-branch/Source/WebCore/platform/sql/SQLiteDatabase.h

@@ -137 +137 @@
 #endif
 
-    WEBCORE_EXPORT static void setIsDatabaseOpeningForbidden(bool);
-
 private:
     static int authorizerFunction(void*, int, const char*, const char*, const char*, const char*);

branches/safari-607-branch/Source/WebCore/platform/sql/SQLiteDatabaseTracker.cpp

@@ -41 +41 @@
 void setClient(SQLiteDatabaseTrackerClient* client)
 {
-    std::lock_guard<Lock> lock(transactionInProgressMutex);
+    ASSERT(client);
+    ASSERT(!s_staticSQLiteDatabaseTrackerClient || s_staticSQLiteDatabaseTrackerClient == client);
     s_staticSQLiteDatabaseTrackerClient = client;
 }
@@ -47 +48 @@
 void incrementTransactionInProgressCount()
 {
-    std::lock_guard<Lock> lock(transactionInProgressMutex);
     if (!s_staticSQLiteDatabaseTrackerClient)
         return;
+
+    std::lock_guard<Lock> lock(transactionInProgressMutex);
 
     s_transactionInProgressCounter++;
@@ -58 +60 @@
 void decrementTransactionInProgressCount()
 {
-    std::lock_guard<Lock> lock(transactionInProgressMutex);
     if (!s_staticSQLiteDatabaseTrackerClient)
         return;
+
+    std::lock_guard<Lock> lock(transactionInProgressMutex);
 
     ASSERT(s_transactionInProgressCounter);
@@ -72 +75 @@
 bool hasTransactionInProgress()
 {
-    std::lock_guard<Lock> lock(transactionInProgressMutex);
     return !s_staticSQLiteDatabaseTrackerClient || s_transactionInProgressCounter > 0;
 }

branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp

@@ -53 +53 @@
 }
 
-WebSQLiteDatabaseTracker::~WebSQLiteDatabaseTracker()
-{
-    ASSERT(RunLoop::isMain());
-    SQLiteDatabaseTracker::setClient(nullptr);
-
-    if (m_hysteresis.state() == PAL::HysteresisState::Started)
-        hysteresisUpdated(PAL::HysteresisState::Stopped);
-}
-
 void WebSQLiteDatabaseTracker::willBeginFirstTransaction()
 {

branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.h

@@ -43 +43 @@
     explicit WebSQLiteDatabaseTracker(WebProcess&);
 
-    ~WebSQLiteDatabaseTracker();
-
     // WebCore::SQLiteDatabaseTrackerClient
     void willBeginFirstTransaction() override;

branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp

@@ -137 +137 @@
 #endif
 
-#if PLATFORM(IOS_FAMILY)
-#include "WebSQLiteDatabaseTracker.h"
-#endif
-
 #if ENABLE(SEC_ITEM_SHIM)
 #include "SecItemShim.h"
@@ -188 +184 @@
     , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
 #if PLATFORM(IOS_FAMILY)
-    , m_webSQLiteDatabaseTracker(std::make_unique<WebSQLiteDatabaseTracker>(*this))
+    , m_webSQLiteDatabaseTracker(*this)
 #endif
 {
@@ -1452 +1448 @@
 
 #if PLATFORM(IOS_FAMILY)
-    m_webSQLiteDatabaseTracker = nullptr;
-    SQLiteDatabase::setIsDatabaseOpeningForbidden(true);
-    if (DatabaseTracker::isInitialized())
-        DatabaseTracker::singleton().closeAllDatabases(CurrentQueryBehavior::Interrupt);
     accessibilityProcessSuspendedNotification(true);
 #endif
@@ -1483 +1475 @@
 
     RELEASE_LOG(ProcessSuspension, "%p - WebProcess::processWillSuspendImminently()", this);
+    DatabaseTracker::singleton().closeAllDatabases(CurrentQueryBehavior::Interrupt);
     actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
     handled = true;
@@ -1499 +1492 @@
 
 #if PLATFORM(IOS_FAMILY)
-    m_webSQLiteDatabaseTracker = std::make_unique<WebSQLiteDatabaseTracker>(*this);
-    SQLiteDatabase::setIsDatabaseOpeningForbidden(false);
     accessibilityProcessSuspendedNotification(false);
 #endif
@@ -1568 +1559 @@
     
 #if PLATFORM(IOS_FAMILY)
-    m_webSQLiteDatabaseTracker = std::make_unique<WebSQLiteDatabaseTracker>(*this);
-    SQLiteDatabase::setIsDatabaseOpeningForbidden(false);
     accessibilityProcessSuspendedNotification(false);
 #endif

branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h

@@ -53 +53 @@
 #endif
 
+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
 namespace API {
 class Object;
@@ -103 +107 @@
 struct WebPageGroupData;
 struct WebPreferencesStore;
-class WebSQLiteDatabaseTracker
 struct WebProcessCreationParameters;
 struct WebsiteData;
@@ -465 +468 @@
 
 #if PLATFORM(IOS_FAMILY)
-    std::unique_ptr<WebSQLiteDatabaseTracker> m_webSQLiteDatabaseTracker;
+    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
 #endif