Rename IDBMetadata.h to IDBDatabaseMetadata.h
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Nov 2013 18:02:48 +0000 (18:02 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Nov 2013 18:02:48 +0000 (18:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=124668

Reviewed by Dean Jackson.

* GNUmakefile.list.am:
* WebCore.xcodeproj/project.pbxproj:

* Modules/indexeddb/IDBDatabase.h:
* Modules/indexeddb/IDBDatabaseBackend.h:

* Modules/indexeddb/IDBDatabaseMetadata.h: Renamed from Source/WebCore/Modules/indexeddb/IDBMetadata.h.
(WebCore::IDBIndexMetadata::IDBIndexMetadata):
(WebCore::IDBObjectStoreMetadata::IDBObjectStoreMetadata):
(WebCore::IDBDatabaseMetadata::IDBDatabaseMetadata):

* Modules/indexeddb/IDBIndex.h:
* Modules/indexeddb/IDBObjectStore.h:
* Modules/indexeddb/IDBServerConnection.h:
* Modules/indexeddb/IDBTransaction.h:
* Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp:
* Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.h:
* Modules/indexeddb/leveldb/IDBIndexWriterLevelDB.h:
* inspector/InspectorIndexedDBAgent.cpp:

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

14 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/indexeddb/IDBDatabase.h
Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.h
Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h [moved from Source/WebCore/Modules/indexeddb/IDBMetadata.h with 97% similarity]
Source/WebCore/Modules/indexeddb/IDBIndex.h
Source/WebCore/Modules/indexeddb/IDBObjectStore.h
Source/WebCore/Modules/indexeddb/IDBServerConnection.h
Source/WebCore/Modules/indexeddb/IDBTransaction.h
Source/WebCore/Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp
Source/WebCore/Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.h
Source/WebCore/Modules/indexeddb/leveldb/IDBIndexWriterLevelDB.h
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

index 8fdb0ea..db3158a 100644 (file)
@@ -1,3 +1,30 @@
+2013-11-20  Brady Eidson  <beidson@apple.com>
+
+        Rename IDBMetadata.h to IDBDatabaseMetadata.h
+        https://bugs.webkit.org/show_bug.cgi?id=124668
+
+        Reviewed by Dean Jackson.
+
+        * GNUmakefile.list.am:
+        * WebCore.xcodeproj/project.pbxproj:
+
+        * Modules/indexeddb/IDBDatabase.h:
+        * Modules/indexeddb/IDBDatabaseBackend.h:
+
+        * Modules/indexeddb/IDBDatabaseMetadata.h: Renamed from Source/WebCore/Modules/indexeddb/IDBMetadata.h.
+        (WebCore::IDBIndexMetadata::IDBIndexMetadata):
+        (WebCore::IDBObjectStoreMetadata::IDBObjectStoreMetadata):
+        (WebCore::IDBDatabaseMetadata::IDBDatabaseMetadata):
+
+        * Modules/indexeddb/IDBIndex.h:
+        * Modules/indexeddb/IDBObjectStore.h:
+        * Modules/indexeddb/IDBServerConnection.h:
+        * Modules/indexeddb/IDBTransaction.h:
+        * Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp:
+        * Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.h:
+        * Modules/indexeddb/leveldb/IDBIndexWriterLevelDB.h:
+        * inspector/InspectorIndexedDBAgent.cpp:
+
 2013-11-20  Ryosuke Niwa  <rniwa@webkit.org>
 
         Remove bogus assertions in updateNameForTreeScope and updateNameForDocument
index 11a0fc5..6d4dd77 100644 (file)
@@ -1809,16 +1809,17 @@ webcore_modules_sources += \
        Source/WebCore/Modules/indexeddb/IDBCursorBackendOperations.h \
        Source/WebCore/Modules/indexeddb/IDBCursorWithValue.cpp \
        Source/WebCore/Modules/indexeddb/IDBCursorWithValue.h \
+       Source/WebCore/Modules/indexeddb/IDBDatabase.cpp \
+       Source/WebCore/Modules/indexeddb/IDBDatabase.h \
        Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp \
        Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.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 \
        Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp \
        Source/WebCore/Modules/indexeddb/IDBDatabaseException.h \
-       Source/WebCore/Modules/indexeddb/IDBDatabase.h \
+       Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h \
        Source/WebCore/Modules/indexeddb/IDBEventDispatcher.cpp \
        Source/WebCore/Modules/indexeddb/IDBEventDispatcher.h \
        Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp \
@@ -1838,7 +1839,6 @@ webcore_modules_sources += \
        Source/WebCore/Modules/indexeddb/IDBKeyRange.h \
        Source/WebCore/Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp \
        Source/WebCore/Modules/indexeddb/leveldb/IDBLevelDBCoding.h \
-       Source/WebCore/Modules/indexeddb/IDBMetadata.h \
        Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp \
        Source/WebCore/Modules/indexeddb/IDBObjectStore.h \
        Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp \
index adf74d0..069dbcf 100644 (file)
@@ -32,7 +32,7 @@
 #include "Event.h"
 #include "EventTarget.h"
 #include "IDBDatabaseCallbacks.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "IndexedDB.h"
index 201abe0..ac980da 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "IDBDatabaseCallbacks.h"
 #include "IDBKeyRange.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBPendingDeleteCall.h"
 #include "IDBPendingOpenCall.h"
 
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IDBMetadata_h
-#define IDBMetadata_h
+#ifndef IDBDatabaseMetadata_h
+#define IDBDatabaseMetadata_h
 
 #include "IDBKeyPath.h"
 #include <stdint.h>
@@ -126,4 +126,4 @@ struct IDBDatabaseMetadata {
 
 #endif // ENABLE(INDEXED_DATABASE)
 
-#endif // IDBMetadata_h
+#endif // IDBDatabaseMetadata_h
index 20560f4..2061c06 100644 (file)
@@ -30,7 +30,7 @@
 #include "IDBDatabase.h"
 #include "IDBKeyPath.h"
 #include "IDBKeyRange.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBObjectStore.h"
 #include "IDBRequest.h"
 #include "ScriptWrappable.h"
index c5fa1f3..6f40d55 100644 (file)
@@ -31,7 +31,7 @@
 #include "IDBIndex.h"
 #include "IDBKey.h"
 #include "IDBKeyRange.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBRequest.h"
 #include "IDBTransaction.h"
 #include "ScriptWrappable.h"
index aca4885..5e19cc1 100644 (file)
@@ -27,7 +27,7 @@
 #define IDBServerConnection_h
 
 #include "IDBCursorBackendOperations.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBTransactionBackendOperations.h"
 #include "IndexedDB.h"
 #include <functional>
index 9ce0a71..84f440d 100644 (file)
@@ -34,7 +34,7 @@
 #include "EventListener.h"
 #include "EventNames.h"
 #include "EventTarget.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IndexedDB.h"
 #include "ScriptWrappable.h"
 #include <wtf/HashSet.h>
index 0dcbed5..bbf8703 100644 (file)
@@ -35,7 +35,7 @@
 #include "IDBKeyPath.h"
 #include "IDBKeyRange.h"
 #include "IDBLevelDBCoding.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBTransactionBackend.h"
 #include "LevelDBComparator.h"
 #include "LevelDBDatabase.h"
index 71f873f..db0c54f 100644 (file)
@@ -31,7 +31,7 @@
 #include "IDBBackingStoreCursorLevelDB.h"
 #include "IDBBackingStoreTransactionLevelDB.h"
 #include "IDBKey.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBRecordIdentifier.h"
 #include "IndexedDB.h"
 #include "LevelDBIterator.h"
index 4c35282..07e5553 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "IDBBackingStoreLevelDB.h"
 #include "IDBDatabaseBackend.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include <wtf/RefCounted.h>
 
 #if ENABLE(INDEXED_DATABASE)
index 0d2d473..196f02d 100644 (file)
                51C0AA410F2AA15E001648C2 /* CachedFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C0AA400F2AA15E001648C2 /* CachedFrame.cpp */; };
                51C81B890C4422F70019ECE3 /* FTPDirectoryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */; };
                51C81B8A0C4422F70019ECE3 /* FTPDirectoryParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C81B880C4422F70019ECE3 /* FTPDirectoryParser.h */; };
+               51C9611B183D2B8000D2002E /* IDBDatabaseMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C9611A183D2B8000D2002E /* IDBDatabaseMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51CBFC990D10E483002DBF51 /* CachedFramePlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CBFC980D10E483002DBF51 /* CachedFramePlatformData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C5150DAA90B7003B3831 /* JSStorageCustom.cpp */; };
                51D719B6181106E00016DC51 /* DOMWindowIndexedDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7196C181106DF0016DC51 /* DOMWindowIndexedDatabase.cpp */; };
                51D719DE181106E00016DC51 /* IDBKeyPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71994181106E00016DC51 /* IDBKeyPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51D719DF181106E00016DC51 /* IDBKeyRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D71995181106E00016DC51 /* IDBKeyRange.cpp */; };
                51D719E0181106E00016DC51 /* IDBKeyRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71996181106E00016DC51 /* IDBKeyRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               51D719E2181106E00016DC51 /* IDBMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71998181106E00016DC51 /* IDBMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51D719E3181106E00016DC51 /* IDBObjectStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D71999181106E00016DC51 /* IDBObjectStore.cpp */; };
                51D719E4181106E00016DC51 /* IDBObjectStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7199A181106E00016DC51 /* IDBObjectStore.h */; };
                51D719E6181106E00016DC51 /* IDBOpenDBRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7199C181106E00016DC51 /* IDBOpenDBRequest.cpp */; };
                51C0AA400F2AA15E001648C2 /* CachedFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CachedFrame.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
                51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectoryParser.cpp; sourceTree = "<group>"; };
                51C81B880C4422F70019ECE3 /* FTPDirectoryParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FTPDirectoryParser.h; sourceTree = "<group>"; };
+               51C9611A183D2B8000D2002E /* IDBDatabaseMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseMetadata.h; sourceTree = "<group>"; };
                51CBFC980D10E483002DBF51 /* CachedFramePlatformData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFramePlatformData.h; sourceTree = "<group>"; };
                51D0C5150DAA90B7003B3831 /* JSStorageCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorageCustom.cpp; sourceTree = "<group>"; };
                51D7196C181106DF0016DC51 /* DOMWindowIndexedDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowIndexedDatabase.cpp; sourceTree = "<group>"; };
                51D71995181106E00016DC51 /* IDBKeyRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKeyRange.cpp; sourceTree = "<group>"; };
                51D71996181106E00016DC51 /* IDBKeyRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKeyRange.h; sourceTree = "<group>"; };
                51D71997181106E00016DC51 /* IDBKeyRange.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBKeyRange.idl; sourceTree = "<group>"; };
-               51D71998181106E00016DC51 /* IDBMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBMetadata.h; sourceTree = "<group>"; };
                51D71999181106E00016DC51 /* IDBObjectStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBObjectStore.cpp; sourceTree = "<group>"; };
                51D7199A181106E00016DC51 /* IDBObjectStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStore.h; sourceTree = "<group>"; };
                51D7199B181106E00016DC51 /* IDBObjectStore.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBObjectStore.idl; sourceTree = "<group>"; };
                                51D71983181106DF0016DC51 /* IDBDatabaseError.h */,
                                51D71984181106DF0016DC51 /* IDBDatabaseException.cpp */,
                                51D71985181106DF0016DC51 /* IDBDatabaseException.h */,
+                               51C9611A183D2B8000D2002E /* IDBDatabaseMetadata.h */,
                                51D71986181106DF0016DC51 /* IDBEventDispatcher.cpp */,
                                51D71987181106DF0016DC51 /* IDBEventDispatcher.h */,
                                51D71988181106DF0016DC51 /* IDBFactory.cpp */,
                                51D71995181106E00016DC51 /* IDBKeyRange.cpp */,
                                51D71996181106E00016DC51 /* IDBKeyRange.h */,
                                51D71997181106E00016DC51 /* IDBKeyRange.idl */,
-                               51D71998181106E00016DC51 /* IDBMetadata.h */,
                                51D71999181106E00016DC51 /* IDBObjectStore.cpp */,
                                51D7199A181106E00016DC51 /* IDBObjectStore.h */,
                                51D7199B181106E00016DC51 /* IDBObjectStore.idl */,
                                49C7B99E1042D2D30009D447 /* JSWebGLRenderbuffer.h in Headers */,
                                49EED1471051969400099FAB /* JSWebGLRenderingContext.h in Headers */,
                                49C7B9A31042D2D30009D447 /* JSWebGLShader.h in Headers */,
+                               51C9611B183D2B8000D2002E /* IDBDatabaseMetadata.h in Headers */,
                                A07D3356152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h in Headers */,
                                49C7B9A51042D2D30009D447 /* JSWebGLTexture.h in Headers */,
                                078E091517D14D1C00420AA1 /* MediaStream.h in Headers */,
                                C5B4C24D1509236C00A6EF37 /* WebCoreNSURLExtras.h in Headers */,
                                DD05FE0D0B8BA3C6009ACDFE /* WebCoreObjCExtras.h in Headers */,
                                EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */,
-                               51D719E2181106E00016DC51 /* IDBMetadata.h in Headers */,
                                E180810F16FCECDF00B80D07 /* WebCoreResourceHandleAsDelegate.h in Headers */,
                                E152551516FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.h in Headers */,
                                93EB169709F880C00091F8FF /* WebCoreSystemInterface.h in Headers */,
index 896de99..9ec1050 100644 (file)
@@ -52,7 +52,7 @@
 #include "IDBKey.h"
 #include "IDBKeyPath.h"
 #include "IDBKeyRange.h"
-#include "IDBMetadata.h"
+#include "IDBDatabaseMetadata.h"
 #include "IDBObjectStore.h"
 #include "IDBOpenDBRequest.h"
 #include "IDBPendingTransactionMonitor.h"