| Index: Source/modules/webdatabase/DatabaseManager.h
|
| diff --git a/Source/modules/webdatabase/DatabaseManager.h b/Source/modules/webdatabase/DatabaseManager.h
|
| index cc2a233c64e60732df2ea9e7b092fa1a100ae753..1c456f63ec1da209cee20b0f1ad134b20c1ade1e 100644
|
| --- a/Source/modules/webdatabase/DatabaseManager.h
|
| +++ b/Source/modules/webdatabase/DatabaseManager.h
|
| @@ -43,7 +43,6 @@ class Database;
|
| class DatabaseBackendBase;
|
| class DatabaseCallback;
|
| class DatabaseContext;
|
| -class DatabaseSync;
|
| class TaskSynchronizer;
|
| class ExceptionState;
|
| class SecurityOrigin;
|
| @@ -72,14 +71,11 @@ public:
|
| static void throwExceptionForDatabaseError(DatabaseError, const String& errorMessage, ExceptionState&);
|
|
|
| PassRefPtrWillBeRawPtr<Database> openDatabase(ExecutionContext*, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, PassOwnPtrWillBeRawPtr<DatabaseCallback>, DatabaseError&, String& errorMessage);
|
| - PassRefPtrWillBeRawPtr<DatabaseSync> openDatabaseSync(ExecutionContext*, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, PassOwnPtrWillBeRawPtr<DatabaseCallback>, DatabaseError&, String& errorMessage);
|
|
|
| String fullPathForDatabase(SecurityOrigin*, const String& name, bool createIfDoesNotExist = true);
|
|
|
| void closeDatabasesImmediately(const String& originIdentifier, const String& name);
|
|
|
| - void interruptAllDatabasesForContext(DatabaseContext*);
|
| -
|
| private:
|
| DatabaseManager();
|
| ~DatabaseManager();
|
| @@ -92,13 +88,15 @@ private:
|
| DatabaseContext* existingDatabaseContextFor(ExecutionContext*);
|
|
|
| PassRefPtrWillBeRawPtr<DatabaseBackendBase> openDatabaseBackend(ExecutionContext*,
|
| - DatabaseType, const String& name, const String& expectedVersion, const String& displayName,
|
| + const String& name, const String& expectedVersion, const String& displayName,
|
| unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
|
|
|
| static void logErrorMessage(ExecutionContext*, const String& message);
|
|
|
| AbstractDatabaseServer* m_server;
|
|
|
| + // FIXME: Only one DatabaseContext object can be created. We can remove the
|
| + // following map, and don't need to worry about locking.
|
| // Access to the following fields require locking m_contextMapLock:
|
| #if ENABLE(OILPAN)
|
| // We can't use PersistentHeapHashMap because multiple threads update the map.
|
|
|