Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

2 files changed, 12 insertions, 12 deletions

diff --git a/WebCore/storage/chromium/DatabaseObserver.h b/WebCore/storage/chromium/DatabaseObserver.h
index 4e266c1..e2e5184 100644
--- a/WebCore/storage/chromium/DatabaseObserver.h
+++ b/WebCore/storage/chromium/DatabaseObserver.h
@@ -33,7 +33,7 @@
 
 namespace WebCore {
 
-class Database;
+class AbstractDatabase;
 class ScriptExecutionContext;
 class String;
 
@@ -42,9 +42,9 @@ class String;
 class DatabaseObserver {
 public:
     static bool canEstablishDatabase(ScriptExecutionContext*, const String&, const String&, unsigned long);
-    static void databaseOpened(Database*);
-    static void databaseModified(Database*);
-    static void databaseClosed(Database*);
+    static void databaseOpened(AbstractDatabase*);
+    static void databaseModified(AbstractDatabase*);
+    static void databaseClosed(AbstractDatabase*);
 };
 
 }
diff --git a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
index 9d2a942..13c65cc 100644
--- a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
+++ b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "DatabaseTracker.h"
 
-#include "Database.h"
+#include "AbstractDatabase.h"
 #include "DatabaseObserver.h"
 #include "DatabaseThread.h"
 #include "QuotaTracker.h"
@@ -72,7 +72,7 @@ String DatabaseTracker::fullPathForDatabase(SecurityOrigin* origin, const String
     return origin->databaseIdentifier() + "/" + name + "#";
 }
 
-void DatabaseTracker::addOpenDatabase(Database* database)
+void DatabaseTracker::addOpenDatabase(AbstractDatabase* database)
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
@@ -99,7 +99,7 @@ void DatabaseTracker::addOpenDatabase(Database* database)
 
 class TrackerRemoveOpenDatabaseTask : public ScriptExecutionContext::Task {
 public:
-    static PassOwnPtr<TrackerRemoveOpenDatabaseTask> create(PassRefPtr<Database> database)
+    static PassOwnPtr<TrackerRemoveOpenDatabaseTask> create(PassRefPtr<AbstractDatabase> database)
     {
         return new TrackerRemoveOpenDatabaseTask(database);
     }
@@ -110,15 +110,15 @@ public:
     }
 
 private:
-    TrackerRemoveOpenDatabaseTask(PassRefPtr<Database> database)
+    TrackerRemoveOpenDatabaseTask(PassRefPtr<AbstractDatabase> database)
         : m_database(database)
     {
     }
 
-    RefPtr<Database> m_database;
+    RefPtr<AbstractDatabase> m_database;
 };
 
-void DatabaseTracker::removeOpenDatabase(Database* database)
+void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
 {
     if (!database->scriptExecutionContext()->isContextThread()) {
         database->scriptExecutionContext()->postTask(TrackerRemoveOpenDatabaseTask::create(database));
@@ -147,7 +147,7 @@ void DatabaseTracker::removeOpenDatabase(Database* database)
 }
 
 
-void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<Database> >* databases)
+void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases)
 {
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
     if (!m_openDatabaseMap)
@@ -165,7 +165,7 @@ void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& nam
         databases->add(*it);
 }
 
-unsigned long long DatabaseTracker::getMaxSizeForDatabase(const Database* database)
+unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database)
 {
     ASSERT(currentThread() == database->scriptExecutionContext()->databaseThread()->getThreadID());
     unsigned long long spaceAvailable = 0;