Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
index fbadafa..8d79fb4 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
@@ -26,11 +26,12 @@
 #include "config.h"
 #include "modules/webdatabase/DatabaseManager.h"
 
-#include "bindings/v8/ExceptionMessages.h"
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionMessages.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
+#include "core/inspector/ConsoleMessage.h"
 #include "platform/Logging.h"
 #include "modules/webdatabase/AbstractDatabaseServer.h"
 #include "modules/webdatabase/Database.h"
@@ -45,7 +46,7 @@
 #include "modules/webdatabase/DatabaseTask.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
-namespace WebCore {
+namespace blink {
 
 DatabaseManager& DatabaseManager::manager()
 {
@@ -54,7 +55,7 @@ DatabaseManager& DatabaseManager::manager()
 }
 
 DatabaseManager::DatabaseManager()
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     : m_databaseContextRegisteredCount(0)
     , m_databaseContextInstanceCount(0)
 #endif
@@ -124,7 +125,7 @@ void DatabaseManager::registerDatabaseContext(DatabaseContext* databaseContext)
 #else
     m_contextMap.set(context, databaseContext);
 #endif
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     m_databaseContextRegisteredCount++;
 #endif
 }
@@ -134,13 +135,13 @@ void DatabaseManager::unregisterDatabaseContext(DatabaseContext* databaseContext
     MutexLocker locker(m_contextMapLock);
     ExecutionContext* context = databaseContext->executionContext();
     ASSERT(m_contextMap.get(context));
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     m_databaseContextRegisteredCount--;
 #endif
     m_contextMap.remove(context);
 }
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
 void DatabaseManager::didConstructDatabaseContext()
 {
     MutexLocker lock(m_contextMapLock);
@@ -276,7 +277,7 @@ void DatabaseManager::interruptAllDatabasesForContext(DatabaseContext* databaseC
 
 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& message)
 {
-    context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message);
+    context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, ErrorMessageLevel, message));
 }
 
-} // namespace WebCore
+} // namespace blink