X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fmodules%2Fwebdatabase%2FSQLTransaction.cpp;h=575f65e4f8b5737c2584d418822703e8710f3d6f;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=7c6473727b878234f71e2a4daaead79f0a961c09;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp b/src/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
index 7c64737..575f65e 100644
--- a/src/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
@@ -32,69 +32,71 @@
 #include "bindings/core/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"
 #include "modules/webdatabase/DatabaseAuthorizer.h"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/SQLError.h"
 #include "modules/webdatabase/SQLStatementCallback.h"
 #include "modules/webdatabase/SQLStatementErrorCallback.h"
+#include "modules/webdatabase/SQLTransactionBackend.h"
 #include "modules/webdatabase/SQLTransactionCallback.h"
 #include "modules/webdatabase/SQLTransactionClient.h" // FIXME: Should be used in the backend only.
 #include "modules/webdatabase/SQLTransactionErrorCallback.h"
+#include "platform/Logging.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<SQLTransaction> SQLTransaction::create(Database* db, PassOwnPtr<SQLTransactionCallback> callback,
-    PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<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, PassOwnPtr<SQLTransactionCallback> callback,
-    PassOwnPtr<VoidCallback> successCallback, PassOwnPtr<SQLTransactionErrorCallback> errorCallback,
+SQLTransaction::SQLTransaction(Database* db, SQLTransactionCallback* callback,
+    VoidCallback* successCallback, SQLTransactionErrorCallback* errorCallback,
     bool readOnly)
     : m_database(db)
-    , m_callbackWrapper(callback, db->executionContext())
-    , m_successCallbackWrapper(successCallback, db->executionContext())
-    , m_errorCallbackWrapper(errorCallback, db->executionContext())
+    , m_callback(callback)
+    , m_successCallback(successCallback)
+    , m_errorCallback(errorCallback)
     , m_executeSqlAllowed(false)
     , m_readOnly(readOnly)
 {
     ASSERT(m_database);
-    ScriptWrappable::init(this);
+}
+
+SQLTransaction::~SQLTransaction()
+{
 }
 
 void SQLTransaction::trace(Visitor* visitor)
 {
     visitor->trace(m_database);
     visitor->trace(m_backend);
-    visitor->trace(m_callbackWrapper);
-    visitor->trace(m_successCallbackWrapper);
-    visitor->trace(m_errorCallbackWrapper);
-    AbstractSQLTransaction::trace(visitor);
+    visitor->trace(m_callback);
+    visitor->trace(m_successCallback);
+    visitor->trace(m_errorCallback);
 }
 
 bool SQLTransaction::hasCallback() const
 {
-    return m_callbackWrapper.hasCallback();
+    return m_callback;
 }
 
 bool SQLTransaction::hasSuccessCallback() const
 {
-    return m_successCallbackWrapper.hasCallback();
+    return m_successCallback;
 }
 
 bool SQLTransaction::hasErrorCallback() const
 {
-    return m_errorCallbackWrapper.hasCallback();
+    return m_errorCallback;
 }
 
-void SQLTransaction::setBackend(AbstractSQLTransactionBackend* backend)
+void SQLTransaction::setBackend(SQLTransactionBackend* backend)
 {
     ASSERT(!m_backend);
     m_backend = backend;
@@ -137,7 +139,7 @@ void SQLTransaction::requestTransitToState(SQLTransactionState nextState)
 SQLTransactionState SQLTransaction::nextStateForTransactionError()
 {
     ASSERT(m_transactionError);
-    if (m_errorCallbackWrapper.hasCallback())
+    if (hasErrorCallback())
         return SQLTransactionState::DeliverTransactionErrorCallback;
 
     // No error callback, so fast-forward to:
@@ -150,8 +152,7 @@ SQLTransactionState SQLTransaction::deliverTransactionCallback()
     bool shouldDeliverErrorCallback = false;
 
     // Spec 4.3.2 4: Invoke the transaction callback with the new SQLTransaction object
-    OwnPtr<SQLTransactionCallback> callback = m_callbackWrapper.unwrap();
-    if (callback) {
+    if (SQLTransactionCallback* callback = m_callback.release()) {
         m_executeSqlAllowed = true;
         shouldDeliverErrorCallback = !callback->handleEvent(this);
         m_executeSqlAllowed = false;
@@ -172,8 +173,7 @@ SQLTransactionState SQLTransaction::deliverTransactionErrorCallback()
 {
     // Spec 4.3.2.10: If exists, invoke error callback with the last
     // error to have occurred in this transaction.
-    OwnPtr<SQLTransactionErrorCallback> errorCallback = m_errorCallbackWrapper.unwrap();
-    if (errorCallback) {
+    if (SQLTransactionErrorCallback* errorCallback = m_errorCallback.release()) {
         // 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.
         // Hence, it's thread safe to fetch the backend transactionError without
@@ -189,7 +189,7 @@ SQLTransactionState SQLTransaction::deliverTransactionErrorCallback()
         m_transactionError = nullptr;
     }
 
-    clearCallbackWrappers();
+    clearCallbacks();
 
     // Spec 4.3.2.10: Rollback the transaction.
     return SQLTransactionState::CleanupAfterTransactionErrorCallback;
@@ -201,8 +201,7 @@ SQLTransactionState SQLTransaction::deliverStatementCallback()
     // Otherwise, continue to loop through the statement queue
     m_executeSqlAllowed = true;
 
-    AbstractSQLStatement* currentAbstractStatement = m_backend->currentStatement();
-    SQLStatement* currentStatement = static_cast<SQLStatement*>(currentAbstractStatement);
+    SQLStatement* currentStatement = m_backend->currentStatement();
     ASSERT(currentStatement);
 
     bool result = currentStatement->performCallback(this);
@@ -230,11 +229,10 @@ SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback()
 SQLTransactionState SQLTransaction::deliverSuccessCallback()
 {
     // Spec 4.3.2.8: Deliver success callback.
-    OwnPtr<VoidCallback> successCallback = m_successCallbackWrapper.unwrap();
-    if (successCallback)
+    if (VoidCallback* successCallback = m_successCallback.release())
         successCallback->handleEvent();
 
-    clearCallbackWrappers();
+    clearCallbacks();
 
     // Schedule a "post-success callback" step to return control to the database thread in case there
     // are further transactions queued up for this Database
@@ -263,7 +261,7 @@ void SQLTransaction::performPendingCallback()
     runStateMachine();
 }
 
-void SQLTransaction::executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, PassOwnPtr<SQLStatementCallback> callback, PassOwnPtr<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.");
@@ -289,7 +287,7 @@ bool SQLTransaction::computeNextStateAndCleanupIfNeeded()
 {
     // Only honor the requested state transition if we're not supposed to be
     // cleaning up and shutting down:
-    if (m_database->opened() && !m_database->isInterrupted()) {
+    if (m_database->opened()) {
         setStateToRequestedState();
         ASSERT(m_nextState == SQLTransactionState::End
             || m_nextState == SQLTransactionState::DeliverTransactionCallback
@@ -302,23 +300,22 @@ bool SQLTransaction::computeNextStateAndCleanupIfNeeded()
         return false;
     }
 
-    clearCallbackWrappers();
+    clearCallbacks();
     m_nextState = SQLTransactionState::CleanupAndTerminate;
 
     return true;
 }
 
-void SQLTransaction::clearCallbackWrappers()
+void SQLTransaction::clearCallbacks()
 {
-    // Release the unneeded callbacks, to break reference cycles.
-    m_callbackWrapper.clear();
-    m_successCallbackWrapper.clear();
-    m_errorCallbackWrapper.clear();
+    m_callback.clear();
+    m_successCallback.clear();
+    m_errorCallback.clear();
 }
 
-PassOwnPtr<SQLTransactionErrorCallback> SQLTransaction::releaseErrorCallback()
+SQLTransactionErrorCallback* SQLTransaction::releaseErrorCallback()
 {
-    return m_errorCallbackWrapper.unwrap();
+    return m_errorCallback.release();
 }
 
 } // namespace blink