Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseBackendSync.cpp b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseBackendSync.cpp
index eba34c2..b5bbd5a 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseBackendSync.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseBackendSync.cpp
@@ -29,25 +29,33 @@
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/DatabaseTracker.h"
 
-namespace WebCore {
+namespace blink {
 
-DatabaseBackendSync::DatabaseBackendSync(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
+DatabaseBackendSync::DatabaseBackendSync(DatabaseContext* databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
     : DatabaseBackendBase(databaseContext, name, expectedVersion, displayName, estimatedSize, DatabaseType::Sync)
 {
 }
 
 DatabaseBackendSync::~DatabaseBackendSync()
 {
+#if !ENABLE(OILPAN)
     // SQLite is "multi-thread safe", but each database handle can only be used
     // on a single thread at a time.
     //
     // For DatabaseBackendSync, we open the SQLite database on the script context
     // thread. And hence we should also close it on that same thread. This means
     // that the SQLite database need to be closed here in the destructor.
-
-    ASSERT(m_databaseContext->isContextThread());
-    if (opened())
+    if (opened()) {
+        ASSERT(m_databaseContext->isContextThread());
         closeDatabase();
+    }
+#endif
+    ASSERT(!opened());
+}
+
+void DatabaseBackendSync::trace(Visitor* visitor)
+{
+    DatabaseBackendBase::trace(visitor);
 }
 
 bool DatabaseBackendSync::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
@@ -56,4 +64,4 @@ bool DatabaseBackendSync::openAndVerifyVersion(bool setVersionInNewDatabase, Dat
     return performOpenAndVerify(setVersionInNewDatabase, error, errorMessage);
 }
 
-} // namespace WebCore
+} // namespace blink