Index: Source/modules/webdatabase/SQLTransaction.cpp |
diff --git a/Source/modules/webdatabase/SQLTransaction.cpp b/Source/modules/webdatabase/SQLTransaction.cpp |
index 1731aa73ca87fb60c74c2c84fa38752b7d29fa53..b3f96fd00606304f9e0a77244e8d8680d93d379a 100644 |
--- a/Source/modules/webdatabase/SQLTransaction.cpp |
+++ b/Source/modules/webdatabase/SQLTransaction.cpp |
@@ -48,15 +48,15 @@ |
namespace blink { |
-PassRefPtrWillBeRawPtr<SQLTransaction> SQLTransaction::create(Database* db, PassOwnPtrWillBeRawPtr<SQLTransactionCallback> callback, |
- PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback, |
+PassRefPtrWillBeRawPtr<SQLTransaction> SQLTransaction::create(Database* db, SQLTransactionCallback* callback, |
+ VoidCallback* successCallback, SQLTransactionErrorCallback* errorCallback, |
bool readOnly) |
{ |
return adoptRefWillBeNoop(new SQLTransaction(db, callback, successCallback, errorCallback, readOnly)); |
} |
-SQLTransaction::SQLTransaction(Database* db, PassOwnPtrWillBeRawPtr<SQLTransactionCallback> callback, |
- PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback, |
+SQLTransaction::SQLTransaction(Database* db, SQLTransactionCallback* callback, |
+ VoidCallback* successCallback, SQLTransactionErrorCallback* errorCallback, |
bool readOnly) |
: m_database(db) |
, m_callbackWrapper(callback, db->executionContext()) |
@@ -152,7 +152,7 @@ SQLTransactionState SQLTransaction::deliverTransactionCallback() |
bool shouldDeliverErrorCallback = false; |
// Spec 4.3.2 4: Invoke the transaction callback with the new SQLTransaction object |
- OwnPtrWillBeRawPtr<SQLTransactionCallback> callback = m_callbackWrapper.unwrap(); |
+ SQLTransactionCallback* callback = m_callbackWrapper.unwrap(); |
if (callback) { |
m_executeSqlAllowed = true; |
shouldDeliverErrorCallback = !callback->handleEvent(this); |
@@ -174,7 +174,7 @@ SQLTransactionState SQLTransaction::deliverTransactionErrorCallback() |
{ |
// Spec 4.3.2.10: If exists, invoke error callback with the last |
// error to have occurred in this transaction. |
- OwnPtrWillBeRawPtr<SQLTransactionErrorCallback> errorCallback = m_errorCallbackWrapper.unwrap(); |
+ SQLTransactionErrorCallback* errorCallback = m_errorCallbackWrapper.unwrap(); |
if (errorCallback) { |
// If we get here with an empty m_transactionError, then the backend |
// must be waiting in the idle state waiting for this state to finish. |
@@ -231,7 +231,7 @@ SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback() |
SQLTransactionState SQLTransaction::deliverSuccessCallback() |
{ |
// Spec 4.3.2.8: Deliver success callback. |
- OwnPtrWillBeRawPtr<VoidCallback> successCallback = m_successCallbackWrapper.unwrap(); |
+ VoidCallback* successCallback = m_successCallbackWrapper.unwrap(); |
if (successCallback) |
successCallback->handleEvent(); |
@@ -264,7 +264,7 @@ void SQLTransaction::performPendingCallback() |
runStateMachine(); |
} |
-void SQLTransaction::executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, PassOwnPtrWillBeRawPtr<SQLStatementCallback> callback, PassOwnPtrWillBeRawPtr<SQLStatementErrorCallback> callbackError, ExceptionState& exceptionState) |
+void SQLTransaction::executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, SQLStatementCallback* callback, SQLStatementErrorCallback* callbackError, ExceptionState& exceptionState) |
{ |
if (!m_executeSqlAllowed) { |
exceptionState.throwDOMException(InvalidStateError, "SQL execution is disallowed."); |
@@ -317,7 +317,7 @@ void SQLTransaction::clearCallbackWrappers() |
m_errorCallbackWrapper.clear(); |
} |
-PassOwnPtrWillBeRawPtr<SQLTransactionErrorCallback> SQLTransaction::releaseErrorCallback() |
+SQLTransactionErrorCallback* SQLTransaction::releaseErrorCallback() |
{ |
return m_errorCallbackWrapper.unwrap(); |
} |