Fix custom builds with indexeddb enabled

Our build-system needs a few updates to make indexeddb enablable again.

This patch does not provide any API for indexeddb or enable indexeddb
itself. It only updates the build system for default disabled feature.

Change-Id: I1ca61bda0913f698bbdf716d286a50051dbe1a99
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

6 files changed, 33 insertions, 3 deletions

diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
index 06670cb79..57a6b0f70 100644
--- a/Source/WebCore/DerivedSources.pri
+++ b/Source/WebCore/DerivedSources.pri
@@ -123,13 +123,16 @@ IDL_BINDINGS += \
     $$PWD/Modules/indexeddb/DOMWindowIndexedDatabase.idl \
     $$PWD/Modules/indexeddb/IDBAny.idl \
     $$PWD/Modules/indexeddb/IDBCursor.idl \
+    $$PWD/Modules/indexeddb/IDBCursorWithValue.idl \
     $$PWD/Modules/indexeddb/IDBDatabase.idl \
     $$PWD/Modules/indexeddb/IDBFactory.idl \
     $$PWD/Modules/indexeddb/IDBIndex.idl \
     $$PWD/Modules/indexeddb/IDBKeyRange.idl \
     $$PWD/Modules/indexeddb/IDBObjectStore.idl \
+    $$PWD/Modules/indexeddb/IDBOpenDBRequest.idl \
     $$PWD/Modules/indexeddb/IDBRequest.idl \
     $$PWD/Modules/indexeddb/IDBTransaction.idl \
+    $$PWD/Modules/indexeddb/IDBVersionChangeEvent.idl \
     $$PWD/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
     $$PWD/Modules/notifications/DOMWindowNotifications.idl \
     $$PWD/Modules/notifications/Notification.idl \
diff --git a/Source/WebCore/Modules/indexeddb/IDBBackingStore.h b/Source/WebCore/Modules/indexeddb/IDBBackingStore.h
index 8409e089a..0d9450914 100644
--- a/Source/WebCore/Modules/indexeddb/IDBBackingStore.h
+++ b/Source/WebCore/Modules/indexeddb/IDBBackingStore.h
@@ -40,6 +40,7 @@ namespace WebCore {
 
 class LevelDBComparator;
 class LevelDBDatabase;
+class LevelDBIterator;
 class LevelDBTransaction;
 class IDBKey;
 class IDBKeyRange;
diff --git a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h
index e618fa068..3718e61c6 100644
--- a/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h
+++ b/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h
@@ -60,8 +60,8 @@ public:
     void run();
     IndexedDB::TransactionMode mode() const { return m_mode; }
     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 scheduleTask(PassOwnPtr<Operation> task, PassOwnPtr<Operation> abortTask = PassOwnPtr<Operation>()) { scheduleTask(IDBDatabaseBackendInterface::NormalTask, task, abortTask); }
+    void scheduleTask(IDBDatabaseBackendInterface::TaskType, PassOwnPtr<Operation>, PassOwnPtr<Operation> abortTask = PassOwnPtr<Operation>());
     void registerOpenCursor(IDBCursorBackendImpl*);
     void unregisterOpenCursor(IDBCursorBackendImpl*);
     void addPreemptiveEvent() { m_pendingPreemptiveEvents++; }
diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index e2044bcaa..bf34ea8fa 100644
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -3068,6 +3068,7 @@ enable?(INDEXED_DATABASE) {
 
     HEADERS += \
         Modules/indexeddb/IDBAny.h \
+        Modules/indexeddb/IDBBackingStore.h \
         Modules/indexeddb/IDBCallbacks.h \
         Modules/indexeddb/IDBCursor.h \
         Modules/indexeddb/IDBCursorBackendImpl.h \
@@ -3084,24 +3085,37 @@ enable?(INDEXED_DATABASE) {
         Modules/indexeddb/IDBHistograms.h \
         Modules/indexeddb/IDBIndex.h \
         Modules/indexeddb/IDBKey.h \
+        Modules/indexeddb/IDBKeyPath.h \
         Modules/indexeddb/IDBKeyRange.h \
         Modules/indexeddb/IDBObjectStore.h \
         Modules/indexeddb/IDBObjectStoreBackendImpl.h \
+        Modules/indexeddb/IDBOpenDBRequest.h \
         Modules/indexeddb/IDBRequest.h \
         Modules/indexeddb/IDBTransaction.h \
+        Modules/indexeddb/IDBTransactionBackendImpl.h \
+        Modules/indexeddb/IDBTransactionCoordinator.h \
+        Modules/indexeddb/IDBVersionChangeEvent.h \
         Modules/indexeddb/IndexedDB.h
 
     SOURCES += \
         bindings/js/IDBBindingUtilities.cpp \
-        bindings/js/JSIDBAnyCustom.cpp
+        bindings/js/JSIDBAnyCustom.cpp \
+        bindings/js/JSIDBDatabaseCustom.cpp \
+        bindings/js/JSIDBObjectStoreCustom.cpp
+
+    SOURCES += \
+        inspector/InspectorIndexedDBAgent.cpp
 
     SOURCES += \
         Modules/indexeddb/DOMWindowIndexedDatabase.cpp \
         Modules/indexeddb/IDBAny.cpp \
+        Modules/indexeddb/IDBBackingStore.cpp \
         Modules/indexeddb/IDBCursor.cpp \
         Modules/indexeddb/IDBCursorBackendImpl.cpp \
+        Modules/indexeddb/IDBCursorWithValue.cpp \
         Modules/indexeddb/IDBDatabase.cpp \
         Modules/indexeddb/IDBDatabaseBackendImpl.cpp \
+        Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp \
         Modules/indexeddb/IDBDatabaseException.cpp \
         Modules/indexeddb/IDBEventDispatcher.cpp \
         Modules/indexeddb/IDBFactory.cpp \
@@ -3109,11 +3123,18 @@ enable?(INDEXED_DATABASE) {
         Modules/indexeddb/IDBFactoryBackendImpl.cpp \
         Modules/indexeddb/IDBIndex.cpp \
         Modules/indexeddb/IDBKey.cpp \
+        Modules/indexeddb/IDBKeyPath.cpp \
         Modules/indexeddb/IDBKeyRange.cpp \
+        Modules/indexeddb/IDBLevelDBCoding.cpp \
         Modules/indexeddb/IDBObjectStore.cpp \
         Modules/indexeddb/IDBObjectStoreBackendImpl.cpp \
+        Modules/indexeddb/IDBOpenDBRequest.cpp \
+        Modules/indexeddb/IDBPendingTransactionMonitor.cpp \
         Modules/indexeddb/IDBRequest.cpp \
         Modules/indexeddb/IDBTransaction.cpp \
+        Modules/indexeddb/IDBTransactionBackendImpl.cpp \
+        Modules/indexeddb/IDBTransactionCoordinator.cpp \
+        Modules/indexeddb/IDBVersionChangeEvent.cpp \
         Modules/indexeddb/PageGroupIndexedDatabase.cpp \
         Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp
 }
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index 3f5002a42..7ed8aa3ae 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -246,6 +246,8 @@ have?(sqlite3) {
     }
 }
 
+use?(leveldb): LIBS += -lleveldb -lmemenv
+
 use?(libjpeg): LIBS += -ljpeg
 use?(libpng): LIBS += -lpng
 use?(webp): LIBS += -lwebp
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index aa8eaae61..e0ce25194 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -170,6 +170,9 @@ defineTest(santizeFeatures) {
     # GStreamer uses Glib
     use?(gstreamer): WEBKIT_CONFIG += use_glib
 
+    # IndexedDB used leveldb.
+    enable?(indexed_database): WEBKIT_CONFIG += use_leveldb
+
     # Minibrowser must be able to query for QtTestSupport
     build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport