Index: Source/modules/webdatabase/Database.cpp |
diff --git a/Source/modules/webdatabase/Database.cpp b/Source/modules/webdatabase/Database.cpp |
index 7cb734e3d12960b2449868802a5de7159b356622..780d1cd16bc2687f0d2a919d1c9d600cba04094d 100644 |
--- a/Source/modules/webdatabase/Database.cpp |
+++ b/Source/modules/webdatabase/Database.cpp |
@@ -112,45 +112,45 @@ void Database::closeImmediately() |
} |
} |
-void Database::changeVersion(const String& oldVersion, const String& newVersion, PassOwnPtrWillBeRawPtr<SQLTransactionCallback> callback, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback) |
+void Database::changeVersion(const String& oldVersion, const String& newVersion, SQLTransactionCallback* callback, SQLTransactionErrorCallback* errorCallback, VoidCallback* successCallback) |
{ |
ChangeVersionData data(oldVersion, newVersion); |
runTransaction(callback, errorCallback, successCallback, false, &data); |
} |
-void Database::transaction(PassOwnPtrWillBeRawPtr<SQLTransactionCallback> callback, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback) |
+void Database::transaction(SQLTransactionCallback* callback, SQLTransactionErrorCallback* errorCallback, VoidCallback* successCallback) |
{ |
runTransaction(callback, errorCallback, successCallback, false); |
} |
-void Database::readTransaction(PassOwnPtrWillBeRawPtr<SQLTransactionCallback> callback, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback) |
+void Database::readTransaction(SQLTransactionCallback* callback, SQLTransactionErrorCallback* errorCallback, VoidCallback* successCallback) |
{ |
runTransaction(callback, errorCallback, successCallback, true); |
} |
-static void callTransactionErrorCallback(ExecutionContext*, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> callback, PassOwnPtr<SQLErrorData> errorData) |
+static void callTransactionErrorCallback(ExecutionContext*, SQLTransactionErrorCallback* callback, PassOwnPtr<SQLErrorData> errorData) |
{ |
RefPtrWillBeRawPtr<SQLError> error = SQLError::create(*errorData); |
callback->handleEvent(error.get()); |
} |
-void Database::runTransaction(PassOwnPtrWillBeRawPtr<SQLTransactionCallback> callback, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback, |
- PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, bool readOnly, const ChangeVersionData* changeVersionData) |
+void Database::runTransaction(SQLTransactionCallback* callback, SQLTransactionErrorCallback* errorCallback, |
+ VoidCallback* successCallback, bool readOnly, const ChangeVersionData* changeVersionData) |
{ |
// FIXME: Rather than passing errorCallback to SQLTransaction and then sometimes firing it ourselves, |
// this code should probably be pushed down into DatabaseBackend so that we only create the SQLTransaction |
// if we're actually going to run it. |
#if ENABLE(ASSERT) |
- SQLTransactionErrorCallback* originalErrorCallback = errorCallback.get(); |
+ SQLTransactionErrorCallback* originalErrorCallback = errorCallback; |
#endif |
RefPtrWillBeRawPtr<SQLTransaction> transaction = SQLTransaction::create(this, callback, successCallback, errorCallback, readOnly); |
RefPtrWillBeRawPtr<SQLTransactionBackend> transactionBackend = backend()->runTransaction(transaction, readOnly, changeVersionData); |
if (!transactionBackend) { |
- OwnPtrWillBeRawPtr<SQLTransactionErrorCallback> callback = transaction->releaseErrorCallback(); |
+ SQLTransactionErrorCallback* callback = transaction->releaseErrorCallback(); |
ASSERT(callback == originalErrorCallback); |
if (callback) { |
OwnPtr<SQLErrorData> error = SQLErrorData::create(SQLError::UNKNOWN_ERR, "database has been closed"); |
- executionContext()->postTask(createCrossThreadTask(&callTransactionErrorCallback, callback.release(), error.release())); |
+ executionContext()->postTask(createCrossThreadTask(&callTransactionErrorCallback, callback, error.release())); |
} |
} |
} |