| Index: Source/modules/webdatabase/SQLTransaction.cpp
|
| diff --git a/Source/modules/webdatabase/SQLTransaction.cpp b/Source/modules/webdatabase/SQLTransaction.cpp
|
| index 16b464aaa536e9d0b9e9984d44a303c4ded23e8c..3a978a8e05ccf6d977d582e7188e5ae711dfd6fd 100644
|
| --- a/Source/modules/webdatabase/SQLTransaction.cpp
|
| +++ b/Source/modules/webdatabase/SQLTransaction.cpp
|
| @@ -31,7 +31,6 @@
|
|
|
| #include "bindings/v8/ExceptionState.h"
|
| #include "core/dom/ExceptionCode.h"
|
| -#include "core/html/VoidCallback.h"
|
| #include "platform/Logging.h"
|
| #include "modules/webdatabase/AbstractSQLTransactionBackend.h"
|
| #include "modules/webdatabase/Database.h"
|
| @@ -43,20 +42,21 @@
|
| #include "modules/webdatabase/SQLTransactionCallback.h"
|
| #include "modules/webdatabase/SQLTransactionClient.h" // FIXME: Should be used in the backend only.
|
| #include "modules/webdatabase/SQLTransactionErrorCallback.h"
|
| +#include "modules/webdatabase/SQLVoidCallback.h"
|
| #include "wtf/StdLibExtras.h"
|
| #include "wtf/Vector.h"
|
|
|
| namespace WebCore {
|
|
|
| PassRefPtr<SQLTransaction> SQLTransaction::create(Database* db, PassRefPtr<SQLTransactionCallback> callback,
|
| - PassRefPtr<VoidCallback> successCallback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
|
| + PassRefPtr<SQLVoidCallback> successCallback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
|
| bool readOnly)
|
| {
|
| return adoptRef(new SQLTransaction(db, callback, successCallback, errorCallback, readOnly));
|
| }
|
|
|
| SQLTransaction::SQLTransaction(Database* db, PassRefPtr<SQLTransactionCallback> callback,
|
| - PassRefPtr<VoidCallback> successCallback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
|
| + PassRefPtr<SQLVoidCallback> successCallback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
|
| bool readOnly)
|
| : m_database(db)
|
| , m_callbackWrapper(callback, db->executionContext())
|
| @@ -218,7 +218,7 @@ SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback()
|
| SQLTransactionState SQLTransaction::deliverSuccessCallback()
|
| {
|
| // Spec 4.3.2.8: Deliver success callback.
|
| - RefPtr<VoidCallback> successCallback = m_successCallbackWrapper.unwrap();
|
| + RefPtr<SQLVoidCallback> successCallback = m_successCallbackWrapper.unwrap();
|
| if (successCallback)
|
| successCallback->handleEvent();
|
|
|
|
|