Diff
Modified: trunk/Source/WebCore/ChangeLog (187926 => 187927)
--- trunk/Source/WebCore/ChangeLog 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 01:08:30 UTC (rev 187927)
@@ -1,5 +1,25 @@
2015-08-04 Anders Carlsson <ander...@apple.com>
+ Remove another unused database function
+ https://bugs.webkit.org/show_bug.cgi?id=147670
+
+ Reviewed by Daniel Bates.
+
+ This was used back when we had WebSQL support in workers, we can safely remove all these functions now.
+
+ * Modules/webdatabase/AbstractDatabaseServer.h:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::interruptAllDatabasesForContext): Deleted.
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ (WebCore::DatabaseServer::interruptAllDatabasesForContext): Deleted.
+ * Modules/webdatabase/DatabaseServer.h:
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::interruptAllDatabasesForContext): Deleted.
+ * Modules/webdatabase/DatabaseTracker.h:
+
+2015-08-04 Anders Carlsson <ander...@apple.com>
+
Remove database thread pause code
https://bugs.webkit.org/show_bug.cgi?id=147669
Modified: trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-08-05 01:08:30 UTC (rev 187927)
@@ -73,8 +73,6 @@
virtual bool deleteOrigin(SecurityOrigin*) = 0;
virtual bool deleteDatabase(SecurityOrigin*, const String& name) = 0;
- virtual void interruptAllDatabasesForContext(const DatabaseContext*) = 0;
-
protected:
AbstractDatabaseServer() { }
virtual ~AbstractDatabaseServer() { }
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-05 01:08:30 UTC (rev 187927)
@@ -402,13 +402,6 @@
m_server->closeAllDatabases();
}
-void DatabaseManager::interruptAllDatabasesForContext(ScriptExecutionContext* context)
-{
- RefPtr<DatabaseContext> databaseContext = existingDatabaseContextFor(context);
- if (databaseContext)
- m_server->interruptAllDatabasesForContext(databaseContext.get());
-}
-
void DatabaseManager::logErrorMessage(ScriptExecutionContext* context, const String& message)
{
context->addConsoleMessage(MessageSource::Storage, MessageLevel::Error, message);
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-08-05 01:08:30 UTC (rev 187927)
@@ -106,8 +106,6 @@
WEBCORE_EXPORT bool deleteOrigin(SecurityOrigin*);
WEBCORE_EXPORT bool deleteDatabase(SecurityOrigin*, const String& name);
- void interruptAllDatabasesForContext(ScriptExecutionContext*);
-
private:
class ProposedDatabase {
public:
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-08-05 01:08:30 UTC (rev 187927)
@@ -113,11 +113,6 @@
DatabaseTracker::tracker().closeAllDatabases();
}
-void DatabaseServer::interruptAllDatabasesForContext(const DatabaseContext* context)
-{
- DatabaseTracker::tracker().interruptAllDatabasesForContext(context);
-}
-
RefPtr<DatabaseBackendBase> DatabaseServer::openDatabase(RefPtr<DatabaseContext>& backendContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError &error, String& errorMessage,
OpenAttempt attempt)
{
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-08-05 01:08:30 UTC (rev 187927)
@@ -62,8 +62,6 @@
bool deleteOrigin(SecurityOrigin*) override;
bool deleteDatabase(SecurityOrigin*, const String& name) override;
- void interruptAllDatabasesForContext(const DatabaseContext*) override;
-
protected:
virtual RefPtr<DatabaseBackendBase> createDatabase(RefPtr<DatabaseContext>&, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
};
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-08-05 01:08:30 UTC (rev 187927)
@@ -325,31 +325,6 @@
database->close();
}
-void DatabaseTracker::interruptAllDatabasesForContext(const DatabaseContext* context)
-{
- Vector<RefPtr<DatabaseBackendBase>> openDatabases;
- {
- MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
-
- if (!m_openDatabaseMap)
- return;
-
- DatabaseNameMap* nameMap = m_openDatabaseMap->get(context->securityOrigin());
- if (!nameMap)
- return;
-
- for (auto& databaseSet : nameMap->values()) {
- for (auto& database : *databaseSet) {
- if (database->databaseContext() == context)
- openDatabases.append(database);
- }
- }
- }
-
- for (auto& openDatabase : openDatabases)
- openDatabase->interrupt();
-}
-
String DatabaseTracker::originPath(SecurityOrigin* origin) const
{
return SQLiteFileSystem::appendDatabaseFileNameToPath(m_databaseDirectoryPath.isolatedCopy(), origin->databaseIdentifier());
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h (187926 => 187927)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-08-05 00:57:51 UTC (rev 187926)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-08-05 01:08:30 UTC (rev 187927)
@@ -76,8 +76,6 @@
WEBCORE_EXPORT void closeAllDatabases();
- void interruptAllDatabasesForContext(const DatabaseContext*);
-
private:
explicit DatabaseTracker(const String& databasePath);
