Upstream version 10.38.222.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webdatabase / DatabaseSync.cpp

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseSync.cpp b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseSync.cpp
index 4298a22..2a5b7c1 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseSync.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseSync.cpp
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "modules/webdatabase/DatabaseSync.h"
 
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "platform/Logging.h"
@@ -46,17 +46,17 @@
 #include "wtf/RefPtr.h"
 #include "wtf/text/CString.h"
 
-namespace WebCore {
+namespace blink {
 
-PassRefPtr<DatabaseSync> DatabaseSync::create(ExecutionContext*, PassRefPtr<DatabaseBackendBase> backend)
+PassRefPtrWillBeRawPtr<DatabaseSync> DatabaseSync::create(ExecutionContext*, PassRefPtrWillBeRawPtr<DatabaseBackendBase> backend)
 {
     return static_cast<DatabaseSync*>(backend.get());
 }
 
-DatabaseSync::DatabaseSync(PassRefPtr<DatabaseContext> databaseContext,
+DatabaseSync::DatabaseSync(DatabaseContext* databaseContext,
     const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
-    : DatabaseBase(databaseContext->executionContext())
-    , DatabaseBackendSync(databaseContext, name, expectedVersion, displayName, estimatedSize)
+    : DatabaseBackendSync(databaseContext, name, expectedVersion, displayName, estimatedSize)
+    , DatabaseBase(databaseContext->executionContext())
 {
     ScriptWrappable::init(this);
     setFrontend(this);
@@ -64,12 +64,20 @@ DatabaseSync::DatabaseSync(PassRefPtr<DatabaseContext> databaseContext,
 
 DatabaseSync::~DatabaseSync()
 {
-    ASSERT(m_executionContext->isContextThread());
+#if !ENABLE(OILPAN)
+    if (executionContext())
+        ASSERT(executionContext()->isContextThread());
+#endif
+}
+
+void DatabaseSync::trace(Visitor* visitor)
+{
+    DatabaseBackendSync::trace(visitor);
 }
 
 void DatabaseSync::changeVersion(const String& oldVersion, const String& newVersion, PassOwnPtr<SQLTransactionSyncCallback> changeVersionCallback, ExceptionState& exceptionState)
 {
-    ASSERT(m_executionContext->isContextThread());
+    ASSERT(executionContext()->isContextThread());
 
     if (sqliteDatabase().transactionInProgress()) {
         reportChangeVersionResult(1, SQLError::DATABASE_ERR, 0);
@@ -78,7 +86,7 @@ void DatabaseSync::changeVersion(const String& oldVersion, const String& newVers
         return;
     }
 
-    RefPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, changeVersionCallback, false);
+    RefPtrWillBeRawPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, changeVersionCallback, false);
     transaction->begin(exceptionState);
     if (exceptionState.hadException()) {
         ASSERT(!lastErrorMessage().isEmpty());
@@ -137,17 +145,17 @@ void DatabaseSync::readTransaction(PassOwnPtr<SQLTransactionSyncCallback> callba
     runTransaction(callback, true, exceptionState);
 }
 
-void DatabaseSync::rollbackTransaction(PassRefPtr<SQLTransactionSync> transaction)
+void DatabaseSync::rollbackTransaction(SQLTransactionSync& transaction)
 {
     ASSERT(!lastErrorMessage().isEmpty());
-    transaction->rollback();
+    transaction.rollback();
     setLastErrorMessage("");
     return;
 }
 
 void DatabaseSync::runTransaction(PassOwnPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionState& exceptionState)
 {
-    ASSERT(m_executionContext->isContextThread());
+    ASSERT(executionContext()->isContextThread());
 
     if (sqliteDatabase().transactionInProgress()) {
         setLastErrorMessage("unable to start a transaction from within a transaction");
@@ -155,22 +163,22 @@ void DatabaseSync::runTransaction(PassOwnPtr<SQLTransactionSyncCallback> callbac
         return;
     }
 
-    RefPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, callback, readOnly);
+    RefPtrWillBeRawPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, callback, readOnly);
     transaction->begin(exceptionState);
     if (exceptionState.hadException()) {
-        rollbackTransaction(transaction);
+        rollbackTransaction(*transaction);
         return;
     }
 
     transaction->execute(exceptionState);
     if (exceptionState.hadException()) {
-        rollbackTransaction(transaction);
+        rollbackTransaction(*transaction);
         return;
     }
 
     transaction->commit(exceptionState);
     if (exceptionState.hadException()) {
-        rollbackTransaction(transaction);
+        rollbackTransaction(*transaction);
         return;
     }
 
@@ -179,7 +187,7 @@ void DatabaseSync::runTransaction(PassOwnPtr<SQLTransactionSyncCallback> callbac
 
 void DatabaseSync::closeImmediately()
 {
-    ASSERT(m_executionContext->isContextThread());
+    ASSERT(executionContext()->isContextThread());
 
     if (!opened())
         return;
@@ -188,4 +196,18 @@ void DatabaseSync::closeImmediately()
     closeDatabase();
 }
 
-} // namespace WebCore
+void DatabaseSync::observeTransaction(SQLTransactionSync& transaction)
+{
+#if ENABLE(OILPAN)
+    m_observers.add(&transaction, adoptPtr(new TransactionObserver(transaction)));
+#endif
+}
+
+#if ENABLE(OILPAN)
+DatabaseSync::TransactionObserver::~TransactionObserver()
+{
+    m_transaction.rollbackIfInProgress();
+}
+#endif
+
+} // namespace blink