Unreviewed build fix for EFL port.
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Sep 2013 03:54:43 +0000 (03:54 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Sep 2013 03:54:43 +0000 (03:54 +0000)
IDBCursorBackendImpl and IDBDatabaseBackendImpl are renamed after r156406.

* Modules/indexeddb/leveldb/IDBCursorBackendLevelDB.h:
* Modules/indexeddb/leveldb/IDBTransactionBackendLevelDB.cpp:
(WebCore::IDBTransactionBackendLevelDB::create):
(WebCore::IDBTransactionBackendLevelDB::IDBTransactionBackendLevelDB):
(WebCore::IDBTransactionBackendLevelDB::registerOpenCursor):
(WebCore::IDBTransactionBackendLevelDB::unregisterOpenCursor):
(WebCore::IDBTransactionBackendLevelDB::closeOpenCursors):
* Modules/indexeddb/leveldb/IDBTransactionBackendLevelDB.h:
(WebCore::IDBTransactionBackendLevelDB::database):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Modules/indexeddb/leveldb/IDBCursorBackendLevelDB.h
Source/WebCore/Modules/indexeddb/leveldb/IDBTransactionBackendLevelDB.cpp
Source/WebCore/Modules/indexeddb/leveldb/IDBTransactionBackendLevelDB.h

index c645331..f5d9585 100644 (file)
@@ -1,3 +1,19 @@
+2013-09-25  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Unreviewed build fix for EFL port.
+
+        IDBCursorBackendImpl and IDBDatabaseBackendImpl are renamed after r156406.
+
+        * Modules/indexeddb/leveldb/IDBCursorBackendLevelDB.h:
+        * Modules/indexeddb/leveldb/IDBTransactionBackendLevelDB.cpp:
+        (WebCore::IDBTransactionBackendLevelDB::create):
+        (WebCore::IDBTransactionBackendLevelDB::IDBTransactionBackendLevelDB):
+        (WebCore::IDBTransactionBackendLevelDB::registerOpenCursor):
+        (WebCore::IDBTransactionBackendLevelDB::unregisterOpenCursor):
+        (WebCore::IDBTransactionBackendLevelDB::closeOpenCursors):
+        * Modules/indexeddb/leveldb/IDBTransactionBackendLevelDB.h:
+        (WebCore::IDBTransactionBackendLevelDB::database):
+
 2013-09-25  Benjamin Poulain  <benjamin@webkit.org>
 
         Do not reenter Document from its destructor
index 7bc7719..08e14c6 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "IDBBackingStoreLevelDB.h"
 #include "IDBCursorBackendInterface.h"
+#include "IDBDatabaseBackendLevelDB.h"
 #include "IDBTransactionBackendLevelDB.h"
 #include "SharedBuffer.h"
 #include <wtf/OwnPtr.h>
@@ -39,7 +40,6 @@
 
 namespace WebCore {
 
-class IDBDatabaseBackendLevelDB;
 class IDBKeyRange;
 
 class IDBCursorBackendLevelDB : public IDBCursorBackendInterface {
index 9f9d006..f889c2b 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(INDEXED_DATABASE) && USE(LEVELDB)
 
 #include "IDBBackingStoreLevelDB.h"
-#include "IDBCursorBackendImpl.h"
+#include "IDBCursorBackendLevelDB.h"
 #include "IDBDatabaseBackendLevelDB.h"
 #include "IDBDatabaseCallbacks.h"
 #include "IDBDatabaseException.h"
@@ -38,7 +38,7 @@
 
 namespace WebCore {
 
-PassRefPtr<IDBTransactionBackendLevelDB> IDBTransactionBackendLevelDB::create(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, IndexedDB::TransactionMode mode, IDBDatabaseBackendImpl* database)
+PassRefPtr<IDBTransactionBackendLevelDB> IDBTransactionBackendLevelDB::create(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, IndexedDB::TransactionMode mode, IDBDatabaseBackendLevelDB* database)
 {
     HashSet<int64_t> objectStoreHashSet;
     for (size_t i = 0; i < objectStoreIds.size(); ++i)
@@ -47,7 +47,7 @@ PassRefPtr<IDBTransactionBackendLevelDB> IDBTransactionBackendLevelDB::create(in
     return adoptRef(new IDBTransactionBackendLevelDB(id, callbacks, objectStoreHashSet, mode, database));
 }
 
-IDBTransactionBackendLevelDB::IDBTransactionBackendLevelDB(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const HashSet<int64_t>& objectStoreIds, IndexedDB::TransactionMode mode, IDBDatabaseBackendImpl* database)
+IDBTransactionBackendLevelDB::IDBTransactionBackendLevelDB(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const HashSet<int64_t>& objectStoreIds, IndexedDB::TransactionMode mode, IDBDatabaseBackendLevelDB* database)
     : m_id(id)
     , m_objectStoreIds(objectStoreIds)
     , m_mode(mode)
@@ -150,12 +150,12 @@ bool IDBTransactionBackendLevelDB::hasPendingTasks() const
     return m_pendingPreemptiveEvents || !isTaskQueueEmpty();
 }
 
-void IDBTransactionBackendLevelDB::registerOpenCursor(IDBCursorBackendImpl* cursor)
+void IDBTransactionBackendLevelDB::registerOpenCursor(IDBCursorBackendLevelDB* cursor)
 {
     m_openCursors.add(cursor);
 }
 
-void IDBTransactionBackendLevelDB::unregisterOpenCursor(IDBCursorBackendImpl* cursor)
+void IDBTransactionBackendLevelDB::unregisterOpenCursor(IDBCursorBackendLevelDB* cursor)
 {
     m_openCursors.remove(cursor);
 }
@@ -262,7 +262,7 @@ void IDBTransactionBackendLevelDB::taskTimerFired(Timer<IDBTransactionBackendLev
 
 void IDBTransactionBackendLevelDB::closeOpenCursors()
 {
-    for (HashSet<IDBCursorBackendImpl*>::iterator i = m_openCursors.begin(); i != m_openCursors.end(); ++i)
+    for (HashSet<IDBCursorBackendLevelDB*>::iterator i = m_openCursors.begin(); i != m_openCursors.end(); ++i)
         (*i)->close();
     m_openCursors.clear();
 }
index f7c8691..6e4f736 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "IDBBackingStoreLevelDB.h"
 #include "IDBDatabaseBackendInterface.h"
+#include "IDBDatabaseBackendLevelDB.h"
 #include "IDBDatabaseError.h"
 #include "Timer.h"
 #include <wtf/Deque.h>
 
 namespace WebCore {
 
-class IDBDatabaseBackendImpl;
-class IDBCursorBackendImpl;
+class IDBCursorBackendLevelDB;
 class IDBDatabaseCallbacks;
 
 class IDBTransactionBackendLevelDB : public RefCounted<IDBTransactionBackendLevelDB> {
 public:
-    static PassRefPtr<IDBTransactionBackendLevelDB> create(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IndexedDB::TransactionMode, IDBDatabaseBackendImpl*);
+    static PassRefPtr<IDBTransactionBackendLevelDB> create(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IndexedDB::TransactionMode, IDBDatabaseBackendLevelDB*);
     virtual ~IDBTransactionBackendLevelDB();
 
     virtual void abort();
@@ -62,17 +62,17 @@ public:
     const HashSet<int64_t>& scope() const { return m_objectStoreIds; }
     void scheduleTask(PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask = nullptr) { scheduleTask(IDBDatabaseBackendInterface::NormalTask, task, abortTask); }
     void scheduleTask(IDBDatabaseBackendInterface::TaskType, PassOwnPtr<Operation>, PassOwnPtr<Operation> abortTask = nullptr);
-    void registerOpenCursor(IDBCursorBackendImpl*);
-    void unregisterOpenCursor(IDBCursorBackendImpl*);
+    void registerOpenCursor(IDBCursorBackendLevelDB*);
+    void unregisterOpenCursor(IDBCursorBackendLevelDB*);
     void addPreemptiveEvent() { m_pendingPreemptiveEvents++; }
     void didCompletePreemptiveEvent() { m_pendingPreemptiveEvents--; ASSERT(m_pendingPreemptiveEvents >= 0); }
     IDBBackingStore::Transaction* backingStoreTransaction() { return &m_transaction; }
     int64_t id() const { return m_id; }
 
-    IDBDatabaseBackendImpl* database() const { return m_database.get(); }
+    IDBDatabaseBackendLevelDB* database() const { return m_database.get(); }
 
 private:
-    IDBTransactionBackendLevelDB(int64_t id, PassRefPtr<IDBDatabaseCallbacks>, const HashSet<int64_t>& objectStoreIds, IndexedDB::TransactionMode, IDBDatabaseBackendImpl*);
+    IDBTransactionBackendLevelDB(int64_t id, PassRefPtr<IDBDatabaseCallbacks>, const HashSet<int64_t>& objectStoreIds, IndexedDB::TransactionMode, IDBDatabaseBackendLevelDB*);
 
     enum State {
         Unused, // Created, but no tasks yet.
@@ -96,7 +96,7 @@ private:
     State m_state;
     bool m_commitPending;
     RefPtr<IDBDatabaseCallbacks> m_callbacks;
-    RefPtr<IDBDatabaseBackendImpl> m_database;
+    RefPtr<IDBDatabaseBackendLevelDB> m_database;
 
     typedef Deque<OwnPtr<Operation> > TaskQueue;
     TaskQueue m_taskQueue;
@@ -109,7 +109,7 @@ private:
     Timer<IDBTransactionBackendLevelDB> m_taskTimer;
     int m_pendingPreemptiveEvents;
 
-    HashSet<IDBCursorBackendImpl*> m_openCursors;
+    HashSet<IDBCursorBackendLevelDB*> m_openCursors;
 };
 
 } // namespace WebCore