Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebDatabase.cpp

diff --git a/src/third_party/WebKit/Source/web/WebDatabase.cpp b/src/third_party/WebKit/Source/web/WebDatabase.cpp
index a1999c6..ebf3ecf 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebDatabase.cpp
+++ b/src/third_party/WebKit/Source/web/WebDatabase.cpp
@@ -31,48 +31,13 @@
 #include "config.h"
 #include "public/web/WebDatabase.h"
 
-#include "modules/webdatabase/DatabaseBackendBase.h"
-#include "modules/webdatabase/DatabaseManager.h"
+#include "modules/webdatabase/DatabaseTracker.h"
 #include "modules/webdatabase/QuotaTracker.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebString.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefPtr.h"
-
-using namespace blink;
 
 namespace blink {
 
-WebString WebDatabase::name() const
-{
-    ASSERT(m_database);
-    return m_database->stringIdentifier();
-}
-
-WebString WebDatabase::displayName() const
-{
-    ASSERT(m_database);
-    return m_database->displayName();
-}
-
-unsigned long WebDatabase::estimatedSize() const
-{
-    ASSERT(m_database);
-    return m_database->estimatedSize();
-}
-
-WebSecurityOrigin WebDatabase::securityOrigin() const
-{
-    ASSERT(m_database);
-    return WebSecurityOrigin(m_database->securityOrigin());
-}
-
-bool WebDatabase::isSyncDatabase() const
-{
-    ASSERT(m_database);
-    return m_database->isSyncDatabase();
-}
-
 void WebDatabase::updateDatabaseSize(const WebString& originIdentifier, const WebString& name, long long size)
 {
     QuotaTracker::instance().updateDatabaseSize(originIdentifier, name, size);
@@ -90,12 +55,7 @@ void WebDatabase::resetSpaceAvailable(const WebString& originIdentifier)
 
 void WebDatabase::closeDatabaseImmediately(const WebString& originIdentifier, const WebString& databaseName)
 {
-    DatabaseManager::manager().closeDatabasesImmediately(originIdentifier, databaseName);
-}
-
-WebDatabase::WebDatabase(const DatabaseBackendBase* database)
-    : m_database(database)
-{
+    DatabaseTracker::tracker().closeDatabasesImmediately(originIdentifier, databaseName);
 }
 
 } // namespace blink