Index: Source/modules/indexeddb/IDBFactoryBackendImpl.cpp |
diff --git a/Source/modules/indexeddb/IDBFactoryBackendImpl.cpp b/Source/modules/indexeddb/IDBFactoryBackendImpl.cpp |
index 0c2f1840303c33c16b4af7c16f672342dc368942..79ae564bc40da1660efb7542427a2938cbe6cdca 100644 |
--- a/Source/modules/indexeddb/IDBFactoryBackendImpl.cpp |
+++ b/Source/modules/indexeddb/IDBFactoryBackendImpl.cpp |
@@ -77,7 +77,7 @@ void IDBFactoryBackendImpl::removeIDBDatabaseBackend(const String& uniqueIdentif |
m_databaseBackendMap.remove(uniqueIdentifier); |
} |
-void IDBFactoryBackendImpl::getDatabaseNames(PassRefPtr<IDBCallbacks> callbacks, const String& databaseIdentifier, ScriptExecutionContext*, const String& dataDirectory) |
+void IDBFactoryBackendImpl::getDatabaseNames(IDBCallbacks* callbacks, const String& databaseIdentifier, ScriptExecutionContext*, const String& dataDirectory) |
{ |
IDB_TRACE("IDBFactoryBackendImpl::getDatabaseNames"); |
RefPtr<IDBBackingStore> backingStore = openBackingStore(databaseIdentifier, dataDirectory); |
@@ -89,7 +89,7 @@ void IDBFactoryBackendImpl::getDatabaseNames(PassRefPtr<IDBCallbacks> callbacks, |
callbacks->onSuccess(backingStore->getDatabaseNames()); |
} |
-void IDBFactoryBackendImpl::deleteDatabase(const String& name, PassRefPtr<IDBCallbacks> callbacks, const String& databaseIdentifier, ScriptExecutionContext*, const String& dataDirectory) |
+void IDBFactoryBackendImpl::deleteDatabase(const String& name, IDBCallbacks* callbacks, const String& databaseIdentifier, ScriptExecutionContext*, const String& dataDirectory) |
{ |
IDB_TRACE("IDBFactoryBackendImpl::deleteDatabase"); |
const String uniqueIdentifier = computeUniqueIdentifier(name, databaseIdentifier); |
@@ -109,9 +109,9 @@ void IDBFactoryBackendImpl::deleteDatabase(const String& name, PassRefPtr<IDBCal |
return; |
} |
- RefPtr<IDBDatabaseBackendImpl> databaseBackend = IDBDatabaseBackendImpl::create(name, backingStore.get(), this, uniqueIdentifier); |
+ IDBDatabaseBackendImpl* databaseBackend = IDBDatabaseBackendImpl::create(name, backingStore.get(), this, uniqueIdentifier); |
if (databaseBackend) { |
- m_databaseBackendMap.set(uniqueIdentifier, databaseBackend.get()); |
+ m_databaseBackendMap.set(uniqueIdentifier, databaseBackend); |
databaseBackend->deleteDatabase(callbacks); |
m_databaseBackendMap.remove(uniqueIdentifier); |
} else |
@@ -149,12 +149,12 @@ PassRefPtr<IDBBackingStore> IDBFactoryBackendImpl::openBackingStore(const String |
return 0; |
} |
-void IDBFactoryBackendImpl::open(const String& name, int64_t version, int64_t transactionId, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, const String& databaseIdentifier, ScriptExecutionContext*, const String& dataDirectory) |
+void IDBFactoryBackendImpl::open(const String& name, int64_t version, int64_t transactionId, IDBCallbacks* callbacks, IDBDatabaseCallbacks* databaseCallbacks, const String& databaseIdentifier, ScriptExecutionContext*, const String& dataDirectory) |
{ |
IDB_TRACE("IDBFactoryBackendImpl::open"); |
const String uniqueIdentifier = computeUniqueIdentifier(name, databaseIdentifier); |
- RefPtr<IDBDatabaseBackendImpl> databaseBackend; |
+ IDBDatabaseBackendImpl* databaseBackend; |
IDBDatabaseBackendMap::iterator it = m_databaseBackendMap.find(uniqueIdentifier); |
if (it == m_databaseBackendMap.end()) { |
RefPtr<IDBBackingStore> backingStore = openBackingStore(databaseIdentifier, dataDirectory); |
@@ -165,7 +165,7 @@ void IDBFactoryBackendImpl::open(const String& name, int64_t version, int64_t tr |
databaseBackend = IDBDatabaseBackendImpl::create(name, backingStore.get(), this, uniqueIdentifier); |
if (databaseBackend) |
- m_databaseBackendMap.set(uniqueIdentifier, databaseBackend.get()); |
+ m_databaseBackendMap.set(uniqueIdentifier, databaseBackend); |
else { |
callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Internal error creating database backend for indexeddb.open.")); |
return; |