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 0b24987..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,7 +46,7 @@
 #include "wtf/RefPtr.h"
 #include "wtf/text/CString.h"
 
-namespace WebCore {
+namespace blink {
 
 PassRefPtrWillBeRawPtr<DatabaseSync> DatabaseSync::create(ExecutionContext*, PassRefPtrWillBeRawPtr<DatabaseBackendBase> backend)
 {
@@ -64,8 +64,10 @@ DatabaseSync::DatabaseSync(DatabaseContext* databaseContext,
 
 DatabaseSync::~DatabaseSync()
 {
+#if !ENABLE(OILPAN)
     if (executionContext())
         ASSERT(executionContext()->isContextThread());
+#endif
 }
 
 void DatabaseSync::trace(Visitor* visitor)
@@ -208,4 +210,4 @@ DatabaseSync::TransactionObserver::~TransactionObserver()
 }
 #endif
 
-} // namespace WebCore
+} // namespace blink