Get IndexedDB closer to building for GTK+.
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 May 2012 17:50:06 +0000 (17:50 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 May 2012 17:50:06 +0000 (17:50 +0000)
Reviewed by Philippe Normand.

.:

* configure.ac: Make out the IndexedDB imply USE_LEVELDB, as LevelDB is the
only IndexedDB backend at the moment. Also mark IndexedDB as incomplete.

Source/WebCore:

No new tests. This is only a build fix.

* GNUmakefile.am: Add the appropriate option to enable LevelDB support.
* GNUmakefile.list.am: Add missing indexed database files to the source list.

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

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
configure.ac

index 0c30da1..9ee2189 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-18  Martin Robinson  <mrobinson@igalia.com>
+
+        Get IndexedDB closer to building for GTK+.
+
+        Reviewed by Philippe Normand.
+
+        * configure.ac: Make out the IndexedDB imply USE_LEVELDB, as LevelDB is the
+        only IndexedDB backend at the moment. Also mark IndexedDB as incomplete.
+
 2012-05-18  Zalan Bujtas  <zbujtas@gmail.com>
 
         [Qt] Gesture tap highlighter needs to take overflow clip into account.
index 1df0d96..fbcd7cd 100644 (file)
@@ -1,3 +1,14 @@
+2012-05-18  Martin Robinson  <mrobinson@igalia.com>
+
+        Get IndexedDB closer to building for GTK+.
+
+        Reviewed by Philippe Normand.
+
+        No new tests. This is only a build fix.
+
+        * GNUmakefile.am: Add the appropriate option to enable LevelDB support.
+        * GNUmakefile.list.am: Add missing indexed database files to the source list.
+
 2012-05-18  Dan Bernstein  <mitz@apple.com>
 
         Removed stale references in the Xcode project after r117369.
index de29105..8ae9929 100644 (file)
@@ -241,6 +241,10 @@ FEATURE_DEFINES += ENABLE_INDEXED_DATABASE=1
 webcore_cppflags += -DENABLE_INDEXED_DATABASE=1
 endif # END ENABLE_INDEXED_DATABASE
 
+if USE_LEVELDB
+webcore_cppflags += -DWTF_USE_LEVELDB
+endif # END USE_LEVELDB
+
 # ----
 # Support for <input type="file" directory>
 # ----
index 68a99a3..021ec39 100644 (file)
@@ -1070,10 +1070,13 @@ webcore_modules_sources += \
        Source/WebCore/Modules/indexeddb/IDBCursorBackendInterface.h \
        Source/WebCore/Modules/indexeddb/IDBCursor.cpp \
        Source/WebCore/Modules/indexeddb/IDBCursor.h \
+       Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp \
+       Source/WebCore/Modules/indexeddb/IDBCursorWithValue.h \
        Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp \
        Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h \
        Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h \
        Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h \
+       Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp \
        Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacksImpl.h \
        Source/WebCore/Modules/indexeddb/IDBDatabase.cpp \
        Source/WebCore/Modules/indexeddb/IDBDatabaseError.h \
@@ -1091,12 +1094,14 @@ webcore_modules_sources += \
        Source/WebCore/Modules/indexeddb/IDBIndexBackendImpl.cpp \
        Source/WebCore/Modules/indexeddb/IDBIndexBackendImpl.h \
        Source/WebCore/Modules/indexeddb/IDBIndexBackendInterface.h \
-       Source/WebCore/Modules/indexeddb/IDBIndexBackendInterface.h \
        Source/WebCore/Modules/indexeddb/IDBIndex.cpp \
        Source/WebCore/Modules/indexeddb/IDBIndex.h \
+       Source/WebCore/Modules/indexeddb/IDBKey.cpp \
        Source/WebCore/Modules/indexeddb/IDBKey.h \
-       Source/WebCore/Modules/indexeddb/IDBKeyPath.h \
+       Source/WebCore/Modules/indexeddb/IDBKeyPathBackendImpl.cpp \
        Source/WebCore/Modules/indexeddb/IDBKeyPathBackendImpl.h \
+       Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp \
+       Source/WebCore/Modules/indexeddb/IDBKeyPath.h \
        Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp \
        Source/WebCore/Modules/indexeddb/IDBKeyRange.h \
        Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp \
@@ -1106,16 +1111,24 @@ webcore_modules_sources += \
        Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp \
        Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h \
        Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h \
-       Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendInterface.h \
        Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp \
        Source/WebCore/Modules/indexeddb/IDBObjectStore.h \
+       Source/WebCore/Modules/indexeddb/IDBPendingTransactionMonitor.cpp \
+       Source/WebCore/Modules/indexeddb/IDBPendingTransactionMonitor.h \
        Source/WebCore/Modules/indexeddb/IDBRequest.cpp \
        Source/WebCore/Modules/indexeddb/IDBRequest.h \
+       Source/WebCore/Modules/indexeddb/IDBTracing.h \
+       Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp \
+       Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h \
        Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h \
+       Source/WebCore/Modules/indexeddb/IDBTransactionCallbacks.h \
+       Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.cpp \
        Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.h \
        Source/WebCore/Modules/indexeddb/IDBTransaction.cpp \
        Source/WebCore/Modules/indexeddb/IDBTransaction.h \
+       Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp \
        Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h \
+       Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.cpp \
        Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.h \
        Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp \
        Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h \
@@ -4970,10 +4983,29 @@ dom_binding_idls += \
        $(WebCore)/Modules/indexeddb/IDBVersionChangeEvent.idl \
        $(WebCore)/Modules/indexeddb/IDBVersionChangeRequest.idl \
        $(WebCore)/Modules/indexeddb/WorkerContextIndexedDatabase.idl
-
+webcore_sources += \
+       Source/WebCore/bindings/js/JSIDBAnyCustom.cpp \
+       Source/WebCore/bindings/js/JSIDBKeyCustom.cpp \
+       Source/WebCore/bindings/js/JSIDBVersionChangeRequestCustom.cpp
 endif # END ENABLE_INDEXED_DATABASE
 
 # ----
+# LevelDB
+# ----
+if USE_LEVELDB
+webcore_sources += \
+       Source/WebCore/platform/leveldb/LevelDBComparator.h \
+       Source/WebCore/platform/leveldb/LevelDBDatabase.cpp \
+       Source/WebCore/platform/leveldb/LevelDBDatabase.h \
+       Source/WebCore/platform/leveldb/LevelDBIterator.h \
+       Source/WebCore/platform/leveldb/LevelDBSlice.h \
+       Source/WebCore/platform/leveldb/LevelDBTransaction.cpp \
+       Source/WebCore/platform/leveldb/LevelDBTransaction.h \
+       Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
+       Source/WebCore/platform/leveldb/LevelDBWriteBatch.h
+endif # end USE_LEVELDB
+
+# ----
 # FileSystem API support
 # ----
 if ENABLE_FILE_SYSTEM
index 32024bd..068c4b5 100644 (file)
@@ -666,7 +666,7 @@ AC_MSG_RESULT([$enable_dom_storage])
 AC_MSG_CHECKING([whether to enable the indexed database API])
 AC_ARG_ENABLE(indexed_database,
               AC_HELP_STRING([--enable-indexed-database],
-                             [enable the indexed database API [default=no]]),
+                             [enable the indexed database API (incomplete) [default=no]]),
               [],[enable_indexed_database="no"])
 AC_MSG_RESULT([$enable_indexed_database])
 
@@ -1340,6 +1340,10 @@ AM_CONDITIONAL([USE_CLUTTER], [test "$with_accelerated_compositing" = "clutter"]
 AM_CONDITIONAL([USE_GLX], [test "$with_accelerated_compositing" = "opengl" || test "$enable_webgl" = "yes"])
 AM_CONDITIONAL([USE_OPENGL], [test "$with_accelerated_compositing" = "opengl" || test "$enable_webgl" = "yes"])
 
+# IndexedDB implies LevelDB, but other features may one day require LevelDB.
+AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
+AM_CONDITIONAL([USE_LEVELDB],[test "$enable_indexed_database" = "yes"])
+
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
@@ -1364,7 +1368,6 @@ AM_CONDITIONAL([ENABLE_STYLE_SCOPED],[test "$enable_style_scoped" = "yes"])
 AM_CONDITIONAL([ENABLE_QUOTA],[test "$enable_quota" = "yes"])
 AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
 AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
-AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
 AM_CONDITIONAL([ENABLE_INPUT_TYPE_COLOR],[test "$enable_input_type_color" = "yes"])
 AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
 AM_CONDITIONAL([ENABLE_SCRIPTED_SPEECH],[test "$enable_scripted_speech" = "yes"])