Moves remaining filesystem files to Modules/filesystem/

https://bugs.webkit.org/show_bug.cgi?id=81353

Patch by Mark Pilgrim <pilgrim@chromium.org> on 2012-03-16
Reviewed by Adam Barth.

No new tests, all existing tests pass.

* CMakeLists.txt:
* DerivedSources.make:
* DerivedSources.pri:
* GNUmakefile.list.am:
* Modules/filesystem/AsyncFileWriter.h: Copied from Source/WebCore/fileapi/AsyncFileWriter.h.
* Modules/filesystem/AsyncFileWriterClient.h: Copied from Source/WebCore/fileapi/AsyncFileWriterClient.h.
* Modules/filesystem/DOMFilePath.cpp: Copied from Source/WebCore/fileapi/DOMFilePath.cpp.
* Modules/filesystem/DOMFilePath.h: Copied from Source/WebCore/fileapi/DOMFilePath.h.
* Modules/filesystem/DOMFileSystem.cpp: Copied from Source/WebCore/fileapi/DOMFileSystem.cpp.
* Modules/filesystem/DOMFileSystem.h: Copied from Source/WebCore/fileapi/DOMFileSystem.h.
* Modules/filesystem/DOMFileSystem.idl: Copied from Source/WebCore/fileapi/DOMFileSystem.idl.
* Modules/filesystem/DOMFileSystemBase.cpp: Copied from Source/WebCore/fileapi/DOMFileSystemBase.cpp.
* Modules/filesystem/DOMFileSystemBase.h: Copied from Source/WebCore/fileapi/DOMFileSystemBase.h.
* Modules/filesystem/DOMFileSystemSync.cpp: Copied from Source/WebCore/fileapi/DOMFileSystemSync.cpp.
* Modules/filesystem/DOMFileSystemSync.h: Copied from Source/WebCore/fileapi/DOMFileSystemSync.h.
* Modules/filesystem/DOMFileSystemSync.idl: Copied from Source/WebCore/fileapi/DOMFileSystemSync.idl.
* Modules/filesystem/Entry.cpp: Copied from Source/WebCore/fileapi/Entry.cpp.
* Modules/filesystem/Entry.h: Copied from Source/WebCore/fileapi/Entry.h.
* Modules/filesystem/Entry.idl: Copied from Source/WebCore/fileapi/Entry.idl.
* Modules/filesystem/EntryArray.cpp: Copied from Source/WebCore/fileapi/EntryArray.cpp.
* Modules/filesystem/EntryArray.h: Copied from Source/WebCore/fileapi/EntryArray.h.
* Modules/filesystem/EntryArray.idl: Copied from Source/WebCore/fileapi/EntryArray.idl.
* Modules/filesystem/EntryArraySync.cpp: Copied from Source/WebCore/fileapi/EntryArraySync.cpp.
* Modules/filesystem/EntryArraySync.h: Copied from Source/WebCore/fileapi/EntryArraySync.h.
* Modules/filesystem/EntryArraySync.idl: Copied from Source/WebCore/fileapi/EntryArraySync.idl.
* Modules/filesystem/EntryBase.cpp: Copied from Source/WebCore/fileapi/EntryBase.cpp.
* Modules/filesystem/EntryBase.h: Copied from Source/WebCore/fileapi/EntryBase.h.
* Modules/filesystem/EntryCallback.h: Copied from Source/WebCore/fileapi/EntryCallback.h.
* Modules/filesystem/EntryCallback.idl: Copied from Source/WebCore/fileapi/EntryCallback.idl.
* Modules/filesystem/EntrySync.cpp: Copied from Source/WebCore/fileapi/EntrySync.cpp.
* Modules/filesystem/EntrySync.h: Copied from Source/WebCore/fileapi/EntrySync.h.
* Modules/filesystem/EntrySync.idl: Copied from Source/WebCore/fileapi/EntrySync.idl.
* Modules/filesystem/ErrorCallback.h: Copied from Source/WebCore/fileapi/ErrorCallback.h.
* Modules/filesystem/ErrorCallback.idl: Copied from Source/WebCore/fileapi/ErrorCallback.idl.
* Modules/filesystem/FileCallback.h: Copied from Source/WebCore/fileapi/FileCallback.h.
* Modules/filesystem/FileCallback.idl: Copied from Source/WebCore/fileapi/FileCallback.idl.
* Modules/filesystem/FileEntry.cpp: Copied from Source/WebCore/fileapi/FileEntry.cpp.
* Modules/filesystem/FileEntry.h: Copied from Source/WebCore/fileapi/FileEntry.h.
* Modules/filesystem/FileEntry.idl: Copied from Source/WebCore/fileapi/FileEntry.idl.
* Modules/filesystem/FileEntrySync.cpp: Copied from Source/WebCore/fileapi/FileEntrySync.cpp.
* Modules/filesystem/FileEntrySync.h: Copied from Source/WebCore/fileapi/FileEntrySync.h.
* Modules/filesystem/FileEntrySync.idl: Copied from Source/WebCore/fileapi/FileEntrySync.idl.
* Modules/filesystem/FileSystemCallback.h: Copied from Source/WebCore/fileapi/FileSystemCallback.h.
* Modules/filesystem/FileSystemCallback.idl: Copied from Source/WebCore/fileapi/FileSystemCallback.idl.
* Modules/filesystem/FileSystemCallbacks.cpp: Copied from Source/WebCore/fileapi/FileSystemCallbacks.cpp.
* Modules/filesystem/FileSystemCallbacks.h: Copied from Source/WebCore/fileapi/FileSystemCallbacks.h.
* Modules/filesystem/FileWriter.cpp: Copied from Source/WebCore/fileapi/FileWriter.cpp.
* Modules/filesystem/FileWriter.h: Copied from Source/WebCore/fileapi/FileWriter.h.
* Modules/filesystem/FileWriter.idl: Copied from Source/WebCore/fileapi/FileWriter.idl.
* Modules/filesystem/FileWriterBase.cpp: Copied from Source/WebCore/fileapi/FileWriterBase.cpp.
* Modules/filesystem/FileWriterBase.h: Copied from Source/WebCore/fileapi/FileWriterBase.h.
* Modules/filesystem/FileWriterBaseCallback.h: Copied from Source/WebCore/fileapi/FileWriterBaseCallback.h.
* Modules/filesystem/FileWriterCallback.h: Copied from Source/WebCore/fileapi/FileWriterCallback.h.
* Modules/filesystem/FileWriterCallback.idl: Copied from Source/WebCore/fileapi/FileWriterCallback.idl.
* Modules/filesystem/FileWriterSync.cpp: Copied from Source/WebCore/fileapi/FileWriterSync.cpp.
* Modules/filesystem/FileWriterSync.h: Copied from Source/WebCore/fileapi/FileWriterSync.h.
* Modules/filesystem/FileWriterSync.idl: Copied from Source/WebCore/fileapi/FileWriterSync.idl.
* Modules/filesystem/LocalFileSystem.cpp: Copied from Source/WebCore/fileapi/LocalFileSystem.cpp.
* Modules/filesystem/LocalFileSystem.h: Copied from Source/WebCore/fileapi/LocalFileSystem.h.
* Modules/filesystem/Metadata.h: Copied from Source/WebCore/fileapi/Metadata.h.
* Modules/filesystem/Metadata.idl: Copied from Source/WebCore/fileapi/Metadata.idl.
* Modules/filesystem/MetadataCallback.h: Copied from Source/WebCore/fileapi/MetadataCallback.h.
* Modules/filesystem/MetadataCallback.idl: Copied from Source/WebCore/fileapi/MetadataCallback.idl.
* Modules/filesystem/SyncCallbackHelper.h: Copied from Source/WebCore/fileapi/SyncCallbackHelper.h.
* Modules/filesystem/WebKitFlags.h: Copied from Source/WebCore/fileapi/WebKitFlags.h.
* Modules/filesystem/WorkerContextFileSystem.cpp: Copied from Source/WebCore/fileapi/WorkerContextFileSystem.cpp.
* Modules/filesystem/WorkerContextFileSystem.h: Copied from Source/WebCore/fileapi/WorkerContextFileSystem.h.
* Modules/filesystem/WorkerContextFileSystem.idl: Copied from Source/WebCore/fileapi/WorkerContextFileSystem.idl.
* Target.pri:
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* fileapi/AsyncFileWriter.h: Removed.
* fileapi/AsyncFileWriterClient.h: Removed.
* fileapi/DOMFilePath.cpp: Removed.
* fileapi/DOMFilePath.h: Removed.
* fileapi/DOMFileSystem.cpp: Removed.
* fileapi/DOMFileSystem.h: Removed.
* fileapi/DOMFileSystem.idl: Removed.
* fileapi/DOMFileSystemBase.cpp: Removed.
* fileapi/DOMFileSystemBase.h: Removed.
* fileapi/DOMFileSystemSync.cpp: Removed.
* fileapi/DOMFileSystemSync.h: Removed.
* fileapi/DOMFileSystemSync.idl: Removed.
* fileapi/Entry.cpp: Removed.
* fileapi/Entry.h: Removed.
* fileapi/Entry.idl: Removed.
* fileapi/EntryArray.cpp: Removed.
* fileapi/EntryArray.h: Removed.
* fileapi/EntryArray.idl: Removed.
* fileapi/EntryArraySync.cpp: Removed.
* fileapi/EntryArraySync.h: Removed.
* fileapi/EntryArraySync.idl: Removed.
* fileapi/EntryBase.cpp: Removed.
* fileapi/EntryBase.h: Removed.
* fileapi/EntryCallback.h: Removed.
* fileapi/EntryCallback.idl: Removed.
* fileapi/EntrySync.cpp: Removed.
* fileapi/EntrySync.h: Removed.
* fileapi/EntrySync.idl: Removed.
* fileapi/ErrorCallback.h: Removed.
* fileapi/ErrorCallback.idl: Removed.
* fileapi/FileCallback.h: Removed.
* fileapi/FileCallback.idl: Removed.
* fileapi/FileEntry.cpp: Removed.
* fileapi/FileEntry.h: Removed.
* fileapi/FileEntry.idl: Removed.
* fileapi/FileEntrySync.cpp: Removed.
* fileapi/FileEntrySync.h: Removed.
* fileapi/FileEntrySync.idl: Removed.
* fileapi/FileSystemCallback.h: Removed.
* fileapi/FileSystemCallback.idl: Removed.
* fileapi/FileSystemCallbacks.cpp: Removed.
* fileapi/FileSystemCallbacks.h: Removed.
* fileapi/FileWriter.cpp: Removed.
* fileapi/FileWriter.h: Removed.
* fileapi/FileWriter.idl: Removed.
* fileapi/FileWriterBase.cpp: Removed.
* fileapi/FileWriterBase.h: Removed.
* fileapi/FileWriterBaseCallback.h: Removed.
* fileapi/FileWriterCallback.h: Removed.
* fileapi/FileWriterCallback.idl: Removed.
* fileapi/FileWriterSync.cpp: Removed.
* fileapi/FileWriterSync.h: Removed.
* fileapi/FileWriterSync.idl: Removed.
* fileapi/LocalFileSystem.cpp: Removed.
* fileapi/LocalFileSystem.h: Removed.
* fileapi/Metadata.h: Removed.
* fileapi/Metadata.idl: Removed.
* fileapi/MetadataCallback.h: Removed.
* fileapi/MetadataCallback.idl: Removed.
* fileapi/SyncCallbackHelper.h: Removed.
* fileapi/WebKitFlags.h: Removed.
* fileapi/WorkerContextFileSystem.cpp: Removed.
* fileapi/WorkerContextFileSystem.h: Removed.
* fileapi/WorkerContextFileSystem.idl: Removed.

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

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 4e54e39e7fe97677f91e27765541a8e8b7c4d1f9..9ac4b8912ee5bdca37788001efd9218286817f81 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -1638,28 +1638,28 @@ ENDIF ()
 
 if (ENABLE_FILE_SYSTEM)
     LIST(APPEND WebCore_SOURCES
+        Modules/filesystem/DOMFilePath.cpp
+        Modules/filesystem/DOMFileSystem.cpp
+        Modules/filesystem/DOMFileSystemBase.cpp
+        Modules/filesystem/DOMFileSystemSync.cpp
         Modules/filesystem/DOMWindowFileSystem.cpp
         Modules/filesystem/DirectoryEntry.cpp
         Modules/filesystem/DirectoryEntrySync.cpp
         Modules/filesystem/DirectoryReader.cpp
         Modules/filesystem/DirectoryReaderSync.cpp
-        fileapi/DOMFilePath.cpp
-        fileapi/DOMFileSystem.cpp
-        fileapi/DOMFileSystemBase.cpp
-        fileapi/DOMFileSystemSync.cpp
-        fileapi/Entry.cpp
-        fileapi/EntryArray.cpp
-        fileapi/EntryArraySync.cpp
-        fileapi/EntryBase.cpp
-        fileapi/EntrySync.cpp
-        fileapi/FileEntry.cpp
-        fileapi/FileEntrySync.cpp
-        fileapi/FileSystemCallbacks.cpp
-        fileapi/FileWriter.cpp
-        fileapi/FileWriterBase.cpp
-        fileapi/FileWriterSync.cpp
-        fileapi/LocalFileSystem.cpp
-        fileapi/WorkerContextFileSystem.cpp
+        Modules/filesystem/Entry.cpp
+        Modules/filesystem/EntryArray.cpp
+        Modules/filesystem/EntryArraySync.cpp
+        Modules/filesystem/EntryBase.cpp
+        Modules/filesystem/EntrySync.cpp
+        Modules/filesystem/FileEntry.cpp
+        Modules/filesystem/FileEntrySync.cpp
+        Modules/filesystem/FileSystemCallbacks.cpp
+        Modules/filesystem/FileWriter.cpp
+        Modules/filesystem/FileWriterBase.cpp
+        Modules/filesystem/FileWriterSync.cpp
+        Modules/filesystem/LocalFileSystem.cpp
+        Modules/filesystem/WorkerContextFileSystem.cpp
         platform/AsyncFileSystem.cpp
     )
     LIST(APPEND WebCore_IDL_FILES
@@ -1668,25 +1668,25 @@ if (ENABLE_FILE_SYSTEM)
         Modules/filesystem/DirectoryEntrySync.idl
         Modules/filesystem/DirectoryReader.idl
         Modules/filesystem/DirectoryReaderSync.idl
-        fileapi/DOMFileSystem.idl
-        fileapi/DOMFileSystemSync.idl
+        Modules/filesystem/DOMFileSystem.idl
+        Modules/filesystem/DOMFileSystemSync.idl
         Modules/filesystem/EntriesCallback.idl
-        fileapi/Entry.idl
-        fileapi/EntrySync.idl
-        fileapi/EntryArray.idl
-        fileapi/EntryArraySync.idl
-        fileapi/EntryCallback.idl
-        fileapi/ErrorCallback.idl
-        fileapi/FileCallback.idl
-        fileapi/FileEntry.idl
-        fileapi/FileEntrySync.idl
-        fileapi/FileSystemCallback.idl
-        fileapi/FileWriterCallback.idl
-        fileapi/FileWriter.idl
-        fileapi/FileWriterSync.idl
-        fileapi/Metadata.idl
-        fileapi/MetadataCallback.idl
-        fileapi/WorkerContextFileSystem.idl
+        Modules/filesystem/Entry.idl
+        Modules/filesystem/EntrySync.idl
+        Modules/filesystem/EntryArray.idl
+        Modules/filesystem/EntryArraySync.idl
+        Modules/filesystem/EntryCallback.idl
+        Modules/filesystem/ErrorCallback.idl
+        Modules/filesystem/FileCallback.idl
+        Modules/filesystem/FileEntry.idl
+        Modules/filesystem/FileEntrySync.idl
+        Modules/filesystem/FileSystemCallback.idl
+        Modules/filesystem/FileWriterCallback.idl
+        Modules/filesystem/FileWriter.idl
+        Modules/filesystem/FileWriterSync.idl
+        Modules/filesystem/Metadata.idl
+        Modules/filesystem/MetadataCallback.idl
+        Modules/filesystem/WorkerContextFileSystem.idl
     )
 ENDIF ()
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 09773f9e9a5928836cc95b5b930d0575c2d7464f..334c868239b6b49c2ce0c64a4a8569278d32661c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,150 @@
+2012-03-16  Mark Pilgrim  <pilgrim@chromium.org>
+
+        Moves remaining filesystem files to Modules/filesystem/
+        https://bugs.webkit.org/show_bug.cgi?id=81353
+
+        Reviewed by Adam Barth.
+
+        No new tests, all existing tests pass.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * DerivedSources.pri:
+        * GNUmakefile.list.am:
+        * Modules/filesystem/AsyncFileWriter.h: Copied from Source/WebCore/fileapi/AsyncFileWriter.h.
+        * Modules/filesystem/AsyncFileWriterClient.h: Copied from Source/WebCore/fileapi/AsyncFileWriterClient.h.
+        * Modules/filesystem/DOMFilePath.cpp: Copied from Source/WebCore/fileapi/DOMFilePath.cpp.
+        * Modules/filesystem/DOMFilePath.h: Copied from Source/WebCore/fileapi/DOMFilePath.h.
+        * Modules/filesystem/DOMFileSystem.cpp: Copied from Source/WebCore/fileapi/DOMFileSystem.cpp.
+        * Modules/filesystem/DOMFileSystem.h: Copied from Source/WebCore/fileapi/DOMFileSystem.h.
+        * Modules/filesystem/DOMFileSystem.idl: Copied from Source/WebCore/fileapi/DOMFileSystem.idl.
+        * Modules/filesystem/DOMFileSystemBase.cpp: Copied from Source/WebCore/fileapi/DOMFileSystemBase.cpp.
+        * Modules/filesystem/DOMFileSystemBase.h: Copied from Source/WebCore/fileapi/DOMFileSystemBase.h.
+        * Modules/filesystem/DOMFileSystemSync.cpp: Copied from Source/WebCore/fileapi/DOMFileSystemSync.cpp.
+        * Modules/filesystem/DOMFileSystemSync.h: Copied from Source/WebCore/fileapi/DOMFileSystemSync.h.
+        * Modules/filesystem/DOMFileSystemSync.idl: Copied from Source/WebCore/fileapi/DOMFileSystemSync.idl.
+        * Modules/filesystem/Entry.cpp: Copied from Source/WebCore/fileapi/Entry.cpp.
+        * Modules/filesystem/Entry.h: Copied from Source/WebCore/fileapi/Entry.h.
+        * Modules/filesystem/Entry.idl: Copied from Source/WebCore/fileapi/Entry.idl.
+        * Modules/filesystem/EntryArray.cpp: Copied from Source/WebCore/fileapi/EntryArray.cpp.
+        * Modules/filesystem/EntryArray.h: Copied from Source/WebCore/fileapi/EntryArray.h.
+        * Modules/filesystem/EntryArray.idl: Copied from Source/WebCore/fileapi/EntryArray.idl.
+        * Modules/filesystem/EntryArraySync.cpp: Copied from Source/WebCore/fileapi/EntryArraySync.cpp.
+        * Modules/filesystem/EntryArraySync.h: Copied from Source/WebCore/fileapi/EntryArraySync.h.
+        * Modules/filesystem/EntryArraySync.idl: Copied from Source/WebCore/fileapi/EntryArraySync.idl.
+        * Modules/filesystem/EntryBase.cpp: Copied from Source/WebCore/fileapi/EntryBase.cpp.
+        * Modules/filesystem/EntryBase.h: Copied from Source/WebCore/fileapi/EntryBase.h.
+        * Modules/filesystem/EntryCallback.h: Copied from Source/WebCore/fileapi/EntryCallback.h.
+        * Modules/filesystem/EntryCallback.idl: Copied from Source/WebCore/fileapi/EntryCallback.idl.
+        * Modules/filesystem/EntrySync.cpp: Copied from Source/WebCore/fileapi/EntrySync.cpp.
+        * Modules/filesystem/EntrySync.h: Copied from Source/WebCore/fileapi/EntrySync.h.
+        * Modules/filesystem/EntrySync.idl: Copied from Source/WebCore/fileapi/EntrySync.idl.
+        * Modules/filesystem/ErrorCallback.h: Copied from Source/WebCore/fileapi/ErrorCallback.h.
+        * Modules/filesystem/ErrorCallback.idl: Copied from Source/WebCore/fileapi/ErrorCallback.idl.
+        * Modules/filesystem/FileCallback.h: Copied from Source/WebCore/fileapi/FileCallback.h.
+        * Modules/filesystem/FileCallback.idl: Copied from Source/WebCore/fileapi/FileCallback.idl.
+        * Modules/filesystem/FileEntry.cpp: Copied from Source/WebCore/fileapi/FileEntry.cpp.
+        * Modules/filesystem/FileEntry.h: Copied from Source/WebCore/fileapi/FileEntry.h.
+        * Modules/filesystem/FileEntry.idl: Copied from Source/WebCore/fileapi/FileEntry.idl.
+        * Modules/filesystem/FileEntrySync.cpp: Copied from Source/WebCore/fileapi/FileEntrySync.cpp.
+        * Modules/filesystem/FileEntrySync.h: Copied from Source/WebCore/fileapi/FileEntrySync.h.
+        * Modules/filesystem/FileEntrySync.idl: Copied from Source/WebCore/fileapi/FileEntrySync.idl.
+        * Modules/filesystem/FileSystemCallback.h: Copied from Source/WebCore/fileapi/FileSystemCallback.h.
+        * Modules/filesystem/FileSystemCallback.idl: Copied from Source/WebCore/fileapi/FileSystemCallback.idl.
+        * Modules/filesystem/FileSystemCallbacks.cpp: Copied from Source/WebCore/fileapi/FileSystemCallbacks.cpp.
+        * Modules/filesystem/FileSystemCallbacks.h: Copied from Source/WebCore/fileapi/FileSystemCallbacks.h.
+        * Modules/filesystem/FileWriter.cpp: Copied from Source/WebCore/fileapi/FileWriter.cpp.
+        * Modules/filesystem/FileWriter.h: Copied from Source/WebCore/fileapi/FileWriter.h.
+        * Modules/filesystem/FileWriter.idl: Copied from Source/WebCore/fileapi/FileWriter.idl.
+        * Modules/filesystem/FileWriterBase.cpp: Copied from Source/WebCore/fileapi/FileWriterBase.cpp.
+        * Modules/filesystem/FileWriterBase.h: Copied from Source/WebCore/fileapi/FileWriterBase.h.
+        * Modules/filesystem/FileWriterBaseCallback.h: Copied from Source/WebCore/fileapi/FileWriterBaseCallback.h.
+        * Modules/filesystem/FileWriterCallback.h: Copied from Source/WebCore/fileapi/FileWriterCallback.h.
+        * Modules/filesystem/FileWriterCallback.idl: Copied from Source/WebCore/fileapi/FileWriterCallback.idl.
+        * Modules/filesystem/FileWriterSync.cpp: Copied from Source/WebCore/fileapi/FileWriterSync.cpp.
+        * Modules/filesystem/FileWriterSync.h: Copied from Source/WebCore/fileapi/FileWriterSync.h.
+        * Modules/filesystem/FileWriterSync.idl: Copied from Source/WebCore/fileapi/FileWriterSync.idl.
+        * Modules/filesystem/LocalFileSystem.cpp: Copied from Source/WebCore/fileapi/LocalFileSystem.cpp.
+        * Modules/filesystem/LocalFileSystem.h: Copied from Source/WebCore/fileapi/LocalFileSystem.h.
+        * Modules/filesystem/Metadata.h: Copied from Source/WebCore/fileapi/Metadata.h.
+        * Modules/filesystem/Metadata.idl: Copied from Source/WebCore/fileapi/Metadata.idl.
+        * Modules/filesystem/MetadataCallback.h: Copied from Source/WebCore/fileapi/MetadataCallback.h.
+        * Modules/filesystem/MetadataCallback.idl: Copied from Source/WebCore/fileapi/MetadataCallback.idl.
+        * Modules/filesystem/SyncCallbackHelper.h: Copied from Source/WebCore/fileapi/SyncCallbackHelper.h.
+        * Modules/filesystem/WebKitFlags.h: Copied from Source/WebCore/fileapi/WebKitFlags.h.
+        * Modules/filesystem/WorkerContextFileSystem.cpp: Copied from Source/WebCore/fileapi/WorkerContextFileSystem.cpp.
+        * Modules/filesystem/WorkerContextFileSystem.h: Copied from Source/WebCore/fileapi/WorkerContextFileSystem.h.
+        * Modules/filesystem/WorkerContextFileSystem.idl: Copied from Source/WebCore/fileapi/WorkerContextFileSystem.idl.
+        * Target.pri:
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * fileapi/AsyncFileWriter.h: Removed.
+        * fileapi/AsyncFileWriterClient.h: Removed.
+        * fileapi/DOMFilePath.cpp: Removed.
+        * fileapi/DOMFilePath.h: Removed.
+        * fileapi/DOMFileSystem.cpp: Removed.
+        * fileapi/DOMFileSystem.h: Removed.
+        * fileapi/DOMFileSystem.idl: Removed.
+        * fileapi/DOMFileSystemBase.cpp: Removed.
+        * fileapi/DOMFileSystemBase.h: Removed.
+        * fileapi/DOMFileSystemSync.cpp: Removed.
+        * fileapi/DOMFileSystemSync.h: Removed.
+        * fileapi/DOMFileSystemSync.idl: Removed.
+        * fileapi/Entry.cpp: Removed.
+        * fileapi/Entry.h: Removed.
+        * fileapi/Entry.idl: Removed.
+        * fileapi/EntryArray.cpp: Removed.
+        * fileapi/EntryArray.h: Removed.
+        * fileapi/EntryArray.idl: Removed.
+        * fileapi/EntryArraySync.cpp: Removed.
+        * fileapi/EntryArraySync.h: Removed.
+        * fileapi/EntryArraySync.idl: Removed.
+        * fileapi/EntryBase.cpp: Removed.
+        * fileapi/EntryBase.h: Removed.
+        * fileapi/EntryCallback.h: Removed.
+        * fileapi/EntryCallback.idl: Removed.
+        * fileapi/EntrySync.cpp: Removed.
+        * fileapi/EntrySync.h: Removed.
+        * fileapi/EntrySync.idl: Removed.
+        * fileapi/ErrorCallback.h: Removed.
+        * fileapi/ErrorCallback.idl: Removed.
+        * fileapi/FileCallback.h: Removed.
+        * fileapi/FileCallback.idl: Removed.
+        * fileapi/FileEntry.cpp: Removed.
+        * fileapi/FileEntry.h: Removed.
+        * fileapi/FileEntry.idl: Removed.
+        * fileapi/FileEntrySync.cpp: Removed.
+        * fileapi/FileEntrySync.h: Removed.
+        * fileapi/FileEntrySync.idl: Removed.
+        * fileapi/FileSystemCallback.h: Removed.
+        * fileapi/FileSystemCallback.idl: Removed.
+        * fileapi/FileSystemCallbacks.cpp: Removed.
+        * fileapi/FileSystemCallbacks.h: Removed.
+        * fileapi/FileWriter.cpp: Removed.
+        * fileapi/FileWriter.h: Removed.
+        * fileapi/FileWriter.idl: Removed.
+        * fileapi/FileWriterBase.cpp: Removed.
+        * fileapi/FileWriterBase.h: Removed.
+        * fileapi/FileWriterBaseCallback.h: Removed.
+        * fileapi/FileWriterCallback.h: Removed.
+        * fileapi/FileWriterCallback.idl: Removed.
+        * fileapi/FileWriterSync.cpp: Removed.
+        * fileapi/FileWriterSync.h: Removed.
+        * fileapi/FileWriterSync.idl: Removed.
+        * fileapi/LocalFileSystem.cpp: Removed.
+        * fileapi/LocalFileSystem.h: Removed.
+        * fileapi/Metadata.h: Removed.
+        * fileapi/Metadata.idl: Removed.
+        * fileapi/MetadataCallback.h: Removed.
+        * fileapi/MetadataCallback.idl: Removed.
+        * fileapi/SyncCallbackHelper.h: Removed.
+        * fileapi/WebKitFlags.h: Removed.
+        * fileapi/WorkerContextFileSystem.cpp: Removed.
+        * fileapi/WorkerContextFileSystem.h: Removed.
+        * fileapi/WorkerContextFileSystem.idl: Removed.
+
 2012-03-16  Mark Pilgrim  <pilgrim@chromium.org>
 
         Collapse ENABLE(BLOB)|ENABLE(FILE_SYSTEM) to just ENABLE(BLOB) in OperationNotAllowedException.idl

diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
index 05c2e9e0362100cc28e99c3e8580bf6fd84d24e5..eff0d8553913f9cbcaec957e961e3ea9ae7f548f 100644 (file)
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
@@ -58,6 +58,30 @@ VPATH = \
 #
 
 BINDING_IDLS = \
+    $(WebCore)/Modules/filesystem/DOMFileSystem.idl \
+    $(WebCore)/Modules/filesystem/DOMFileSystemSync.idl \
+    $(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
+    $(WebCore)/Modules/filesystem/DirectoryEntry.idl \
+    $(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
+    $(WebCore)/Modules/filesystem/DirectoryReader.idl \
+    $(WebCore)/Modules/filesystem/DirectoryReaderSync.idl \
+    $(WebCore)/Modules/filesystem/EntriesCallback.idl \
+    $(WebCore)/Modules/filesystem/Entry.idl \
+    $(WebCore)/Modules/filesystem/EntryArray.idl \
+    $(WebCore)/Modules/filesystem/EntryArraySync.idl \
+    $(WebCore)/Modules/filesystem/EntryCallback.idl \
+    $(WebCore)/Modules/filesystem/EntrySync.idl \
+    $(WebCore)/Modules/filesystem/ErrorCallback.idl \
+    $(WebCore)/Modules/filesystem/FileCallback.idl \
+    $(WebCore)/Modules/filesystem/FileEntry.idl \
+    $(WebCore)/Modules/filesystem/FileEntrySync.idl \
+    $(WebCore)/Modules/filesystem/FileSystemCallback.idl \
+    $(WebCore)/Modules/filesystem/FileWriter.idl \
+    $(WebCore)/Modules/filesystem/FileWriterCallback.idl \
+    $(WebCore)/Modules/filesystem/FileWriterSync.idl \
+    $(WebCore)/Modules/filesystem/Metadata.idl \
+    $(WebCore)/Modules/filesystem/MetadataCallback.idl \
+    $(WebCore)/Modules/filesystem/WorkerContextFileSystem.idl \
     $(WebCore)/Modules/geolocation/Geolocation.idl \
     $(WebCore)/Modules/geolocation/Geoposition.idl \
     $(WebCore)/Modules/geolocation/NavigatorGeolocation.idl \
@@ -195,38 +219,14 @@ BINDING_IDLS = \
     $(WebCore)/dom/WebKitTransitionEvent.idl \
     $(WebCore)/dom/WheelEvent.idl \
     $(WebCore)/fileapi/Blob.idl \
-    $(WebCore)/fileapi/DOMFileSystem.idl \
-    $(WebCore)/fileapi/DOMFileSystemSync.idl \
-    $(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
-    $(WebCore)/Modules/filesystem/DirectoryEntry.idl \
-    $(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
-    $(WebCore)/Modules/filesystem/DirectoryReader.idl \
-    $(WebCore)/Modules/filesystem/DirectoryReaderSync.idl \
-    $(WebCore)/Modules/filesystem/EntriesCallback.idl \
-    $(WebCore)/fileapi/Entry.idl \
-    $(WebCore)/fileapi/EntryArray.idl \
-    $(WebCore)/fileapi/EntryArraySync.idl \
-    $(WebCore)/fileapi/EntryCallback.idl \
-    $(WebCore)/fileapi/EntrySync.idl \
-    $(WebCore)/fileapi/ErrorCallback.idl \
     $(WebCore)/fileapi/File.idl \
-    $(WebCore)/fileapi/FileCallback.idl \
-    $(WebCore)/fileapi/FileEntry.idl \
-    $(WebCore)/fileapi/FileEntrySync.idl \
     $(WebCore)/fileapi/FileError.idl \
     $(WebCore)/fileapi/FileException.idl \
     $(WebCore)/fileapi/FileList.idl \
     $(WebCore)/fileapi/FileReader.idl \
     $(WebCore)/fileapi/FileReaderSync.idl \
-    $(WebCore)/fileapi/FileSystemCallback.idl \
-    $(WebCore)/fileapi/FileWriter.idl \
-    $(WebCore)/fileapi/FileWriterCallback.idl \
-    $(WebCore)/fileapi/FileWriterSync.idl \
-    $(WebCore)/fileapi/Metadata.idl \
-    $(WebCore)/fileapi/MetadataCallback.idl \
     $(WebCore)/fileapi/OperationNotAllowedException.idl \
     $(WebCore)/fileapi/WebKitBlobBuilder.idl \
-    $(WebCore)/fileapi/WorkerContextFileSystem.idl \
     $(WebCore)/html/DOMFormData.idl \
     $(WebCore)/html/DOMSettableTokenList.idl \
     $(WebCore)/html/DOMTokenList.idl \

diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
index 10c3e455c83c3322b20db125e5c1b94075229798..d0dae3fffb623981fc41ebb8cff7fdb47136f1e6 100644 (file)
--- a/Source/WebCore/DerivedSources.pri
+++ b/Source/WebCore/DerivedSources.pri
@@ -86,6 +86,30 @@ STYLESHEETS_EMBED = \
     $$PWD/css/mobileThemeQt.css
 
 IDL_BINDINGS += \
+    $$PWD/Modules/filesystem/DOMFileSystem.idl \
+    $$PWD/Modules/filesystem/DOMFileSystemSync.idl \
+    $$PWD/Modules/filesystem/DOMWindowFileSystem.idl \
+    $$PWD/Modules/filesystem/DirectoryEntry.idl \
+    $$PWD/Modules/filesystem/DirectoryEntrySync.idl \
+    $$PWD/Modules/filesystem/DirectoryReader.idl \
+    $$PWD/Modules/filesystem/DirectoryReaderSync.idl \
+    $$PWD/Modules/filesystem/EntriesCallback.idl \
+    $$PWD/Modules/filesystem/Entry.idl \
+    $$PWD/Modules/filesystem/EntryArray.idl \
+    $$PWD/Modules/filesystem/EntryArraySync.idl \
+    $$PWD/Modules/filesystem/EntryCallback.idl \
+    $$PWD/Modules/filesystem/EntrySync.idl \
+    $$PWD/Modules/filesystem/ErrorCallback.idl \
+    $$PWD/Modules/filesystem/FileCallback.idl \
+    $$PWD/Modules/filesystem/FileEntry.idl \
+    $$PWD/Modules/filesystem/FileEntrySync.idl \
+    $$PWD/Modules/filesystem/FileSystemCallback.idl \
+    $$PWD/Modules/filesystem/FileWriter.idl \
+    $$PWD/Modules/filesystem/FileWriterCallback.idl \
+    $$PWD/Modules/filesystem/Metadata.idl \
+    $$PWD/Modules/filesystem/MetadataCallback.idl \
+    $$PWD/Modules/filesystem/WebKitBlobBuilder.idl \
+    $$PWD/Modules/filesystem/WorkerContextFileSystem.idl \
     $$PWD/Modules/geolocation/Geolocation.idl \
     $$PWD/Modules/geolocation/Geoposition.idl \
     $$PWD/Modules/geolocation/NavigatorGeolocation.idl \
@@ -216,37 +240,13 @@ IDL_BINDINGS += \
     $$PWD/dom/WebKitTransitionEvent.idl \
     $$PWD/dom/WheelEvent.idl \
     $$PWD/fileapi/Blob.idl \
-    $$PWD/Modules/filesystem/DOMWindowFileSystem.idl \
-    $$PWD/Modules/filesystem/DirectoryEntry.idl \
-    $$PWD/Modules/filesystem/DirectoryEntrySync.idl \
-    $$PWD/Modules/filesystem/DirectoryReader.idl \
-    $$PWD/Modules/filesystem/DirectoryReaderSync.idl \
-    $$PWD/fileapi/DOMFileSystem.idl \
-    $$PWD/fileapi/DOMFileSystemSync.idl \
-    $$PWD/Modules/filesystem/EntriesCallback.idl \
-    $$PWD/fileapi/Entry.idl \
-    $$PWD/fileapi/EntryArray.idl \
-    $$PWD/fileapi/EntryArraySync.idl \
-    $$PWD/fileapi/EntryCallback.idl \
-    $$PWD/fileapi/EntrySync.idl \
-    $$PWD/fileapi/ErrorCallback.idl \
     $$PWD/fileapi/File.idl \
-    $$PWD/fileapi/FileCallback.idl \
-    $$PWD/fileapi/FileEntry.idl \
-    $$PWD/fileapi/FileEntrySync.idl \
     $$PWD/fileapi/FileError.idl \
     $$PWD/fileapi/FileException.idl \
     $$PWD/fileapi/FileList.idl \
     $$PWD/fileapi/FileReader.idl \
     $$PWD/fileapi/FileReaderSync.idl \
-    $$PWD/fileapi/FileSystemCallback.idl \
-    $$PWD/fileapi/FileWriter.idl \
-    $$PWD/fileapi/FileWriterCallback.idl \
     $$PWD/fileapi/OperationNotAllowedException.idl \
-    $$PWD/fileapi/Metadata.idl \
-    $$PWD/fileapi/MetadataCallback.idl \
-    $$PWD/fileapi/WebKitBlobBuilder.idl \
-    $$PWD/fileapi/WorkerContextFileSystem.idl \
     $$PWD/html/canvas/ArrayBufferView.idl \
     $$PWD/html/canvas/ArrayBuffer.idl \
     $$PWD/html/canvas/DataView.idl \

diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index e84994853dc6454ca1a31f90964948ecd1d6086c..dc1a0b1e9cff433ed41da3bfbfe274f994542aeb 100644 (file)
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -962,6 +962,62 @@ dom_binding_idls += \
        $(WebCore)/xml/XSLTProcessor.idl
 
 webcore_sources += \
+       Source/WebCore/Modules/filesystem/AsyncFileWriter.h \
+       Source/WebCore/Modules/filesystem/AsyncFileWriterClient.h \
+       Source/WebCore/Modules/filesystem/DOMFilePath.cpp \
+       Source/WebCore/Modules/filesystem/DOMFilePath.h \
+       Source/WebCore/Modules/filesystem/DOMFileSystem.cpp \
+       Source/WebCore/Modules/filesystem/DOMFileSystem.h \
+       Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp \
+       Source/WebCore/Modules/filesystem/DOMFileSystemBase.h \
+       Source/WebCore/Modules/filesystem/DOMFileSystemSync.cpp \
+       Source/WebCore/Modules/filesystem/DOMFileSystemSync.h \
+       Source/WebCore/Modules/filesystem/DOMWindowFileSystem.cpp \
+       Source/WebCore/Modules/filesystem/DOMWindowFileSystem.h \
+       Source/WebCore/Modules/filesystem/DirectoryEntry.cpp \
+       Source/WebCore/Modules/filesystem/DirectoryEntry.h \
+       Source/WebCore/Modules/filesystem/DirectoryEntrySync.cpp \
+       Source/WebCore/Modules/filesystem/DirectoryEntrySync.h \
+       Source/WebCore/Modules/filesystem/DirectoryReader.cpp \
+       Source/WebCore/Modules/filesystem/DirectoryReader.h \
+       Source/WebCore/Modules/filesystem/DirectoryReaderSync.cpp \
+       Source/WebCore/Modules/filesystem/DirectoryReaderSync.h \
+       Source/WebCore/Modules/filesystem/EntriesCallback.h \
+       Source/WebCore/Modules/filesystem/Entry.cpp \
+       Source/WebCore/Modules/filesystem/Entry.h \
+       Source/WebCore/Modules/filesystem/EntryArray.cpp \
+       Source/WebCore/Modules/filesystem/EntryArray.h \
+       Source/WebCore/Modules/filesystem/EntryArraySync.cpp \
+       Source/WebCore/Modules/filesystem/EntryArraySync.h \
+       Source/WebCore/Modules/filesystem/EntryBase.cpp \
+       Source/WebCore/Modules/filesystem/EntryBase.h \
+       Source/WebCore/Modules/filesystem/EntryCallback.h \
+       Source/WebCore/Modules/filesystem/EntrySync.cpp \
+       Source/WebCore/Modules/filesystem/EntrySync.h \
+       Source/WebCore/Modules/filesystem/ErrorCallback.h \
+       Source/WebCore/Modules/filesystem/FileCallback.h \
+       Source/WebCore/Modules/filesystem/FileEntry.cpp \
+       Source/WebCore/Modules/filesystem/FileEntry.h \
+       Source/WebCore/Modules/filesystem/FileEntrySync.cpp \
+       Source/WebCore/Modules/filesystem/FileEntrySync.h \
+       Source/WebCore/Modules/filesystem/FileSystemCallback.h \
+       Source/WebCore/Modules/filesystem/FileSystemCallbacks.cpp \
+       Source/WebCore/Modules/filesystem/FileSystemCallbacks.h \
+       Source/WebCore/Modules/filesystem/FileWriter.cpp \
+       Source/WebCore/Modules/filesystem/FileWriter.h \
+       Source/WebCore/Modules/filesystem/FileWriterBase.cpp \
+       Source/WebCore/Modules/filesystem/FileWriterBase.h \
+       Source/WebCore/Modules/filesystem/FileWriterBaseCallback.h \
+       Source/WebCore/Modules/filesystem/FileWriterCallback.h \
+       Source/WebCore/Modules/filesystem/FileWriterSync.cpp \
+       Source/WebCore/Modules/filesystem/FileWriterSync.h \
+       Source/WebCore/Modules/filesystem/LocalFileSystem.cpp \
+       Source/WebCore/Modules/filesystem/LocalFileSystem.h \
+       Source/WebCore/Modules/filesystem/MetadataCallback.h \
+       Source/WebCore/Modules/filesystem/Metadata.h \
+       Source/WebCore/Modules/filesystem/WebKitFlags.h \
+       Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp \
+       Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h \
        Source/WebCore/Modules/geolocation/Geolocation.cpp \
        Source/WebCore/Modules/geolocation/Geolocation.h \
        Source/WebCore/Modules/geolocation/GeolocationController.cpp \
@@ -2041,49 +2097,11 @@ webcore_sources += \
        Source/WebCore/editing/WritingDirection.h \
        Source/WebCore/fileapi/AsyncFileStream.cpp \
        Source/WebCore/fileapi/AsyncFileStream.h \
-       Source/WebCore/fileapi/AsyncFileWriter.h \
-       Source/WebCore/fileapi/AsyncFileWriterClient.h \
        Source/WebCore/fileapi/Blob.cpp \
        Source/WebCore/fileapi/Blob.h \
        Source/WebCore/fileapi/BlobURL.cpp \
        Source/WebCore/fileapi/BlobURL.h \
-       Source/WebCore/Modules/filesystem/DOMWindowFileSystem.cpp \
-       Source/WebCore/Modules/filesystem/DOMWindowFileSystem.h \
-       Source/WebCore/Modules/filesystem/DirectoryEntry.cpp \
-       Source/WebCore/Modules/filesystem/DirectoryEntry.h \
-       Source/WebCore/Modules/filesystem/DirectoryEntrySync.cpp \
-       Source/WebCore/Modules/filesystem/DirectoryEntrySync.h \
-       Source/WebCore/Modules/filesystem/DirectoryReader.cpp \
-       Source/WebCore/Modules/filesystem/DirectoryReader.h \
-       Source/WebCore/Modules/filesystem/DirectoryReaderSync.cpp \
-       Source/WebCore/Modules/filesystem/DirectoryReaderSync.h \
-       Source/WebCore/fileapi/DOMFilePath.cpp \
-       Source/WebCore/fileapi/DOMFilePath.h \
-       Source/WebCore/fileapi/DOMFileSystem.cpp \
-       Source/WebCore/fileapi/DOMFileSystem.h \
-       Source/WebCore/fileapi/DOMFileSystemBase.cpp \
-       Source/WebCore/fileapi/DOMFileSystemBase.h \
-       Source/WebCore/fileapi/DOMFileSystemSync.cpp \
-       Source/WebCore/fileapi/DOMFileSystemSync.h \
-       Source/WebCore/Modules/filesystem/EntriesCallback.h \
-       Source/WebCore/fileapi/Entry.cpp \
-       Source/WebCore/fileapi/Entry.h \
-       Source/WebCore/fileapi/EntryArray.cpp \
-       Source/WebCore/fileapi/EntryArray.h \
-       Source/WebCore/fileapi/EntryArraySync.cpp \
-       Source/WebCore/fileapi/EntryArraySync.h \
-       Source/WebCore/fileapi/EntryBase.cpp \
-       Source/WebCore/fileapi/EntryBase.h \
-       Source/WebCore/fileapi/EntryCallback.h \
-       Source/WebCore/fileapi/EntrySync.cpp \
-       Source/WebCore/fileapi/EntrySync.h \
-       Source/WebCore/fileapi/ErrorCallback.h \
-       Source/WebCore/fileapi/FileCallback.h \
        Source/WebCore/fileapi/File.cpp \
-       Source/WebCore/fileapi/FileEntry.cpp \
-       Source/WebCore/fileapi/FileEntry.h \
-       Source/WebCore/fileapi/FileEntrySync.cpp \
-       Source/WebCore/fileapi/FileEntrySync.h \
        Source/WebCore/fileapi/FileError.h \
        Source/WebCore/fileapi/FileException.h \
        Source/WebCore/fileapi/File.h \
@@ -2098,33 +2116,15 @@ webcore_sources += \
        Source/WebCore/fileapi/FileReaderLoaderClient.h \
        Source/WebCore/fileapi/FileReaderSync.cpp \
        Source/WebCore/fileapi/FileReaderSync.h \
-       Source/WebCore/fileapi/FileSystemCallback.h \
-       Source/WebCore/fileapi/FileSystemCallbacks.cpp \
-       Source/WebCore/fileapi/FileSystemCallbacks.h \
        Source/WebCore/fileapi/FileThread.cpp \
        Source/WebCore/fileapi/FileThread.h \
        Source/WebCore/fileapi/FileThreadTask.h \
-       Source/WebCore/fileapi/FileWriter.cpp \
-       Source/WebCore/fileapi/FileWriter.h \
-       Source/WebCore/fileapi/FileWriterBase.cpp \
-       Source/WebCore/fileapi/FileWriterBase.h \
-       Source/WebCore/fileapi/FileWriterBaseCallback.h \
-       Source/WebCore/fileapi/FileWriterCallback.h \
-       Source/WebCore/fileapi/FileWriterSync.cpp \
-       Source/WebCore/fileapi/FileWriterSync.h \
-       Source/WebCore/fileapi/WebKitFlags.h \
-       Source/WebCore/fileapi/LocalFileSystem.cpp \
-       Source/WebCore/fileapi/LocalFileSystem.h \
-       Source/WebCore/fileapi/MetadataCallback.h \
-       Source/WebCore/fileapi/Metadata.h \
        Source/WebCore/fileapi/OperationNotAllowedException.cpp \
        Source/WebCore/fileapi/OperationNotAllowedException.h \
        Source/WebCore/fileapi/ThreadableBlobRegistry.cpp \
        Source/WebCore/fileapi/ThreadableBlobRegistry.h \
        Source/WebCore/fileapi/WebKitBlobBuilder.cpp \
        Source/WebCore/fileapi/WebKitBlobBuilder.h \
-       Source/WebCore/fileapi/WorkerContextFileSystem.cpp \
-       Source/WebCore/fileapi/WorkerContextFileSystem.h \
        Source/WebCore/history/BackForwardController.cpp \
        Source/WebCore/history/BackForwardController.h \
        Source/WebCore/history/BackForwardList.h \
@@ -4892,30 +4892,30 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSMetadataCallback.h
 
 dom_binding_idls += \
-       $(WebCore)/fileapi/DOMFileSystem.idl \
-       $(WebCore)/fileapi/DOMFileSystemSync.idl \
+       $(WebCore)/Modules/filesystem/DOMFileSystem.idl \
+       $(WebCore)/Modules/filesystem/DOMFileSystemSync.idl \
        $(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
        $(WebCore)/Modules/filesystem/DirectoryEntry.idl \
        $(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
        $(WebCore)/Modules/filesystem/DirectoryReader.idl \
        $(WebCore)/Modules/filesystem/DirectoryReaderSync.idl \
        $(WebCore)/Modules/filesystem/EntriesCallback.idl \
-       $(WebCore)/fileapi/Entry.idl \
-       $(WebCore)/fileapi/EntryArray.idl \
-       $(WebCore)/fileapi/EntryArraySync.idl \
-       $(WebCore)/fileapi/EntryCallback.idl \
-       $(WebCore)/fileapi/EntrySync.idl \
-       $(WebCore)/fileapi/ErrorCallback.idl \
-       $(WebCore)/fileapi/FileCallback.idl \
-       $(WebCore)/fileapi/FileEntry.idl \
-       $(WebCore)/fileapi/FileEntrySync.idl \
-       $(WebCore)/fileapi/FileSystemCallback.idl \
-       $(WebCore)/fileapi/FileWriter.idl \
-       $(WebCore)/fileapi/FileWriterCallback.idl \
-       $(WebCore)/fileapi/FileWriterSync.idl \
-       $(WebCore)/fileapi/Metadata.idl \
-       $(WebCore)/fileapi/MetadataCallback.idl \
-       $(WebCore)/fileapi/WorkerContextFileSystem.idl
+       $(WebCore)/Modules/filesystem/Entry.idl \
+       $(WebCore)/Modules/filesystem/EntryArray.idl \
+       $(WebCore)/Modules/filesystem/EntryArraySync.idl \
+       $(WebCore)/Modules/filesystem/EntryCallback.idl \
+       $(WebCore)/Modules/filesystem/EntrySync.idl \
+       $(WebCore)/Modules/filesystem/ErrorCallback.idl \
+       $(WebCore)/Modules/filesystem/FileCallback.idl \
+       $(WebCore)/Modules/filesystem/FileEntry.idl \
+       $(WebCore)/Modules/filesystem/FileEntrySync.idl \
+       $(WebCore)/Modules/filesystem/FileSystemCallback.idl \
+       $(WebCore)/Modules/filesystem/FileWriter.idl \
+       $(WebCore)/Modules/filesystem/FileWriterCallback.idl \
+       $(WebCore)/Modules/filesystem/FileWriterSync.idl \
+       $(WebCore)/Modules/filesystem/Metadata.idl \
+       $(WebCore)/Modules/filesystem/MetadataCallback.idl \
+       $(WebCore)/Modules/filesystem/WorkerContextFileSystem.idl
 
 webcoregtk_sources += \
        Source/WebCore/platform/gtk/AsyncFileSystemGtk.cpp \

diff --git a/Source/WebCore/fileapi/AsyncFileWriter.h b/Source/WebCore/Modules/filesystem/AsyncFileWriter.h
similarity index 100%
rename from Source/WebCore/fileapi/AsyncFileWriter.h
rename to Source/WebCore/Modules/filesystem/AsyncFileWriter.h

diff --git a/Source/WebCore/fileapi/AsyncFileWriterClient.h b/Source/WebCore/Modules/filesystem/AsyncFileWriterClient.h
similarity index 100%
rename from Source/WebCore/fileapi/AsyncFileWriterClient.h
rename to Source/WebCore/Modules/filesystem/AsyncFileWriterClient.h

diff --git a/Source/WebCore/fileapi/DOMFilePath.cpp b/Source/WebCore/Modules/filesystem/DOMFilePath.cpp
similarity index 100%
rename from Source/WebCore/fileapi/DOMFilePath.cpp
rename to Source/WebCore/Modules/filesystem/DOMFilePath.cpp

diff --git a/Source/WebCore/fileapi/DOMFilePath.h b/Source/WebCore/Modules/filesystem/DOMFilePath.h
similarity index 100%
rename from Source/WebCore/fileapi/DOMFilePath.h
rename to Source/WebCore/Modules/filesystem/DOMFilePath.h

diff --git a/Source/WebCore/fileapi/DOMFileSystem.cpp b/Source/WebCore/Modules/filesystem/DOMFileSystem.cpp
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystem.cpp
rename to Source/WebCore/Modules/filesystem/DOMFileSystem.cpp

diff --git a/Source/WebCore/fileapi/DOMFileSystem.h b/Source/WebCore/Modules/filesystem/DOMFileSystem.h
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystem.h
rename to Source/WebCore/Modules/filesystem/DOMFileSystem.h

diff --git a/Source/WebCore/fileapi/DOMFileSystem.idl b/Source/WebCore/Modules/filesystem/DOMFileSystem.idl
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystem.idl
rename to Source/WebCore/Modules/filesystem/DOMFileSystem.idl

diff --git a/Source/WebCore/fileapi/DOMFileSystemBase.cpp b/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystemBase.cpp
rename to Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp

diff --git a/Source/WebCore/fileapi/DOMFileSystemBase.h b/Source/WebCore/Modules/filesystem/DOMFileSystemBase.h
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystemBase.h
rename to Source/WebCore/Modules/filesystem/DOMFileSystemBase.h

diff --git a/Source/WebCore/fileapi/DOMFileSystemSync.cpp b/Source/WebCore/Modules/filesystem/DOMFileSystemSync.cpp
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystemSync.cpp
rename to Source/WebCore/Modules/filesystem/DOMFileSystemSync.cpp

diff --git a/Source/WebCore/fileapi/DOMFileSystemSync.h b/Source/WebCore/Modules/filesystem/DOMFileSystemSync.h
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystemSync.h
rename to Source/WebCore/Modules/filesystem/DOMFileSystemSync.h

diff --git a/Source/WebCore/fileapi/DOMFileSystemSync.idl b/Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl
similarity index 100%
rename from Source/WebCore/fileapi/DOMFileSystemSync.idl
rename to Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl

diff --git a/Source/WebCore/fileapi/Entry.cpp b/Source/WebCore/Modules/filesystem/Entry.cpp
similarity index 100%
rename from Source/WebCore/fileapi/Entry.cpp
rename to Source/WebCore/Modules/filesystem/Entry.cpp

diff --git a/Source/WebCore/fileapi/Entry.h b/Source/WebCore/Modules/filesystem/Entry.h
similarity index 100%
rename from Source/WebCore/fileapi/Entry.h
rename to Source/WebCore/Modules/filesystem/Entry.h

diff --git a/Source/WebCore/fileapi/Entry.idl b/Source/WebCore/Modules/filesystem/Entry.idl
similarity index 100%
rename from Source/WebCore/fileapi/Entry.idl
rename to Source/WebCore/Modules/filesystem/Entry.idl

diff --git a/Source/WebCore/fileapi/EntryArray.cpp b/Source/WebCore/Modules/filesystem/EntryArray.cpp
similarity index 100%
rename from Source/WebCore/fileapi/EntryArray.cpp
rename to Source/WebCore/Modules/filesystem/EntryArray.cpp

diff --git a/Source/WebCore/fileapi/EntryArray.h b/Source/WebCore/Modules/filesystem/EntryArray.h
similarity index 100%
rename from Source/WebCore/fileapi/EntryArray.h
rename to Source/WebCore/Modules/filesystem/EntryArray.h

diff --git a/Source/WebCore/fileapi/EntryArray.idl b/Source/WebCore/Modules/filesystem/EntryArray.idl
similarity index 100%
rename from Source/WebCore/fileapi/EntryArray.idl
rename to Source/WebCore/Modules/filesystem/EntryArray.idl

diff --git a/Source/WebCore/fileapi/EntryArraySync.cpp b/Source/WebCore/Modules/filesystem/EntryArraySync.cpp
similarity index 100%
rename from Source/WebCore/fileapi/EntryArraySync.cpp
rename to Source/WebCore/Modules/filesystem/EntryArraySync.cpp

diff --git a/Source/WebCore/fileapi/EntryArraySync.h b/Source/WebCore/Modules/filesystem/EntryArraySync.h
similarity index 100%
rename from Source/WebCore/fileapi/EntryArraySync.h
rename to Source/WebCore/Modules/filesystem/EntryArraySync.h

diff --git a/Source/WebCore/fileapi/EntryArraySync.idl b/Source/WebCore/Modules/filesystem/EntryArraySync.idl
similarity index 100%
rename from Source/WebCore/fileapi/EntryArraySync.idl
rename to Source/WebCore/Modules/filesystem/EntryArraySync.idl

diff --git a/Source/WebCore/fileapi/EntryBase.cpp b/Source/WebCore/Modules/filesystem/EntryBase.cpp
similarity index 100%
rename from Source/WebCore/fileapi/EntryBase.cpp
rename to Source/WebCore/Modules/filesystem/EntryBase.cpp

diff --git a/Source/WebCore/fileapi/EntryBase.h b/Source/WebCore/Modules/filesystem/EntryBase.h
similarity index 100%
rename from Source/WebCore/fileapi/EntryBase.h
rename to Source/WebCore/Modules/filesystem/EntryBase.h

diff --git a/Source/WebCore/fileapi/EntryCallback.h b/Source/WebCore/Modules/filesystem/EntryCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/EntryCallback.h
rename to Source/WebCore/Modules/filesystem/EntryCallback.h

diff --git a/Source/WebCore/fileapi/EntryCallback.idl b/Source/WebCore/Modules/filesystem/EntryCallback.idl
similarity index 100%
rename from Source/WebCore/fileapi/EntryCallback.idl
rename to Source/WebCore/Modules/filesystem/EntryCallback.idl

diff --git a/Source/WebCore/fileapi/EntrySync.cpp b/Source/WebCore/Modules/filesystem/EntrySync.cpp
similarity index 100%
rename from Source/WebCore/fileapi/EntrySync.cpp
rename to Source/WebCore/Modules/filesystem/EntrySync.cpp

diff --git a/Source/WebCore/fileapi/EntrySync.h b/Source/WebCore/Modules/filesystem/EntrySync.h
similarity index 100%
rename from Source/WebCore/fileapi/EntrySync.h
rename to Source/WebCore/Modules/filesystem/EntrySync.h

diff --git a/Source/WebCore/fileapi/EntrySync.idl b/Source/WebCore/Modules/filesystem/EntrySync.idl
similarity index 100%
rename from Source/WebCore/fileapi/EntrySync.idl
rename to Source/WebCore/Modules/filesystem/EntrySync.idl

diff --git a/Source/WebCore/fileapi/ErrorCallback.h b/Source/WebCore/Modules/filesystem/ErrorCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/ErrorCallback.h
rename to Source/WebCore/Modules/filesystem/ErrorCallback.h

diff --git a/Source/WebCore/fileapi/ErrorCallback.idl b/Source/WebCore/Modules/filesystem/ErrorCallback.idl
similarity index 100%
rename from Source/WebCore/fileapi/ErrorCallback.idl
rename to Source/WebCore/Modules/filesystem/ErrorCallback.idl

diff --git a/Source/WebCore/fileapi/FileCallback.h b/Source/WebCore/Modules/filesystem/FileCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/FileCallback.h
rename to Source/WebCore/Modules/filesystem/FileCallback.h

diff --git a/Source/WebCore/fileapi/FileCallback.idl b/Source/WebCore/Modules/filesystem/FileCallback.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileCallback.idl
rename to Source/WebCore/Modules/filesystem/FileCallback.idl

diff --git a/Source/WebCore/fileapi/FileEntry.cpp b/Source/WebCore/Modules/filesystem/FileEntry.cpp
similarity index 100%
rename from Source/WebCore/fileapi/FileEntry.cpp
rename to Source/WebCore/Modules/filesystem/FileEntry.cpp

diff --git a/Source/WebCore/fileapi/FileEntry.h b/Source/WebCore/Modules/filesystem/FileEntry.h
similarity index 100%
rename from Source/WebCore/fileapi/FileEntry.h
rename to Source/WebCore/Modules/filesystem/FileEntry.h

diff --git a/Source/WebCore/fileapi/FileEntry.idl b/Source/WebCore/Modules/filesystem/FileEntry.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileEntry.idl
rename to Source/WebCore/Modules/filesystem/FileEntry.idl

diff --git a/Source/WebCore/fileapi/FileEntrySync.cpp b/Source/WebCore/Modules/filesystem/FileEntrySync.cpp
similarity index 100%
rename from Source/WebCore/fileapi/FileEntrySync.cpp
rename to Source/WebCore/Modules/filesystem/FileEntrySync.cpp

diff --git a/Source/WebCore/fileapi/FileEntrySync.h b/Source/WebCore/Modules/filesystem/FileEntrySync.h
similarity index 100%
rename from Source/WebCore/fileapi/FileEntrySync.h
rename to Source/WebCore/Modules/filesystem/FileEntrySync.h

diff --git a/Source/WebCore/fileapi/FileEntrySync.idl b/Source/WebCore/Modules/filesystem/FileEntrySync.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileEntrySync.idl
rename to Source/WebCore/Modules/filesystem/FileEntrySync.idl

diff --git a/Source/WebCore/fileapi/FileSystemCallback.h b/Source/WebCore/Modules/filesystem/FileSystemCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/FileSystemCallback.h
rename to Source/WebCore/Modules/filesystem/FileSystemCallback.h

diff --git a/Source/WebCore/fileapi/FileSystemCallback.idl b/Source/WebCore/Modules/filesystem/FileSystemCallback.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileSystemCallback.idl
rename to Source/WebCore/Modules/filesystem/FileSystemCallback.idl

diff --git a/Source/WebCore/fileapi/FileSystemCallbacks.cpp b/Source/WebCore/Modules/filesystem/FileSystemCallbacks.cpp
similarity index 100%
rename from Source/WebCore/fileapi/FileSystemCallbacks.cpp
rename to Source/WebCore/Modules/filesystem/FileSystemCallbacks.cpp

diff --git a/Source/WebCore/fileapi/FileSystemCallbacks.h b/Source/WebCore/Modules/filesystem/FileSystemCallbacks.h
similarity index 100%
rename from Source/WebCore/fileapi/FileSystemCallbacks.h
rename to Source/WebCore/Modules/filesystem/FileSystemCallbacks.h

diff --git a/Source/WebCore/fileapi/FileWriter.cpp b/Source/WebCore/Modules/filesystem/FileWriter.cpp
similarity index 100%
rename from Source/WebCore/fileapi/FileWriter.cpp
rename to Source/WebCore/Modules/filesystem/FileWriter.cpp

diff --git a/Source/WebCore/fileapi/FileWriter.h b/Source/WebCore/Modules/filesystem/FileWriter.h
similarity index 100%
rename from Source/WebCore/fileapi/FileWriter.h
rename to Source/WebCore/Modules/filesystem/FileWriter.h

diff --git a/Source/WebCore/fileapi/FileWriter.idl b/Source/WebCore/Modules/filesystem/FileWriter.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileWriter.idl
rename to Source/WebCore/Modules/filesystem/FileWriter.idl

diff --git a/Source/WebCore/fileapi/FileWriterBase.cpp b/Source/WebCore/Modules/filesystem/FileWriterBase.cpp
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterBase.cpp
rename to Source/WebCore/Modules/filesystem/FileWriterBase.cpp

diff --git a/Source/WebCore/fileapi/FileWriterBase.h b/Source/WebCore/Modules/filesystem/FileWriterBase.h
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterBase.h
rename to Source/WebCore/Modules/filesystem/FileWriterBase.h

diff --git a/Source/WebCore/fileapi/FileWriterBaseCallback.h b/Source/WebCore/Modules/filesystem/FileWriterBaseCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterBaseCallback.h
rename to Source/WebCore/Modules/filesystem/FileWriterBaseCallback.h

diff --git a/Source/WebCore/fileapi/FileWriterCallback.h b/Source/WebCore/Modules/filesystem/FileWriterCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterCallback.h
rename to Source/WebCore/Modules/filesystem/FileWriterCallback.h

diff --git a/Source/WebCore/fileapi/FileWriterCallback.idl b/Source/WebCore/Modules/filesystem/FileWriterCallback.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterCallback.idl
rename to Source/WebCore/Modules/filesystem/FileWriterCallback.idl

diff --git a/Source/WebCore/fileapi/FileWriterSync.cpp b/Source/WebCore/Modules/filesystem/FileWriterSync.cpp
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterSync.cpp
rename to Source/WebCore/Modules/filesystem/FileWriterSync.cpp

diff --git a/Source/WebCore/fileapi/FileWriterSync.h b/Source/WebCore/Modules/filesystem/FileWriterSync.h
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterSync.h
rename to Source/WebCore/Modules/filesystem/FileWriterSync.h

diff --git a/Source/WebCore/fileapi/FileWriterSync.idl b/Source/WebCore/Modules/filesystem/FileWriterSync.idl
similarity index 100%
rename from Source/WebCore/fileapi/FileWriterSync.idl
rename to Source/WebCore/Modules/filesystem/FileWriterSync.idl

diff --git a/Source/WebCore/fileapi/LocalFileSystem.cpp b/Source/WebCore/Modules/filesystem/LocalFileSystem.cpp
similarity index 100%
rename from Source/WebCore/fileapi/LocalFileSystem.cpp
rename to Source/WebCore/Modules/filesystem/LocalFileSystem.cpp

diff --git a/Source/WebCore/fileapi/LocalFileSystem.h b/Source/WebCore/Modules/filesystem/LocalFileSystem.h
similarity index 100%
rename from Source/WebCore/fileapi/LocalFileSystem.h
rename to Source/WebCore/Modules/filesystem/LocalFileSystem.h

diff --git a/Source/WebCore/fileapi/Metadata.h b/Source/WebCore/Modules/filesystem/Metadata.h
similarity index 100%
rename from Source/WebCore/fileapi/Metadata.h
rename to Source/WebCore/Modules/filesystem/Metadata.h

diff --git a/Source/WebCore/fileapi/Metadata.idl b/Source/WebCore/Modules/filesystem/Metadata.idl
similarity index 100%
rename from Source/WebCore/fileapi/Metadata.idl
rename to Source/WebCore/Modules/filesystem/Metadata.idl

diff --git a/Source/WebCore/fileapi/MetadataCallback.h b/Source/WebCore/Modules/filesystem/MetadataCallback.h
similarity index 100%
rename from Source/WebCore/fileapi/MetadataCallback.h
rename to Source/WebCore/Modules/filesystem/MetadataCallback.h

diff --git a/Source/WebCore/fileapi/MetadataCallback.idl b/Source/WebCore/Modules/filesystem/MetadataCallback.idl
similarity index 100%
rename from Source/WebCore/fileapi/MetadataCallback.idl
rename to Source/WebCore/Modules/filesystem/MetadataCallback.idl

diff --git a/Source/WebCore/fileapi/SyncCallbackHelper.h b/Source/WebCore/Modules/filesystem/SyncCallbackHelper.h
similarity index 100%
rename from Source/WebCore/fileapi/SyncCallbackHelper.h
rename to Source/WebCore/Modules/filesystem/SyncCallbackHelper.h

diff --git a/Source/WebCore/fileapi/WebKitFlags.h b/Source/WebCore/Modules/filesystem/WebKitFlags.h
similarity index 100%
rename from Source/WebCore/fileapi/WebKitFlags.h
rename to Source/WebCore/Modules/filesystem/WebKitFlags.h

diff --git a/Source/WebCore/fileapi/WorkerContextFileSystem.cpp b/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp
similarity index 100%
rename from Source/WebCore/fileapi/WorkerContextFileSystem.cpp
rename to Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp

diff --git a/Source/WebCore/fileapi/WorkerContextFileSystem.h b/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h
similarity index 100%
rename from Source/WebCore/fileapi/WorkerContextFileSystem.h
rename to Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h

diff --git a/Source/WebCore/fileapi/WorkerContextFileSystem.idl b/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl
similarity index 100%
rename from Source/WebCore/fileapi/WorkerContextFileSystem.idl
rename to Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl

diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index 9c13455a9444fe10e26077ce29e748367711fada..7063ac1b593658b99b1f51d3ca0e4e2b27cc8ac9 100644 (file)
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -403,11 +403,27 @@ v8 {
 }
 
 SOURCES += \
+    Modules/filesystem/DOMFilePath.cpp \
+    Modules/filesystem/DOMFileSystem.cpp \
+    Modules/filesystem/DOMFileSystemBase.cpp \
+    Modules/filesystem/DOMFileSystemSync.cpp \
     Modules/filesystem/DOMWindowFileSystem.cpp \
     Modules/filesystem/DirectoryEntry.cpp \
     Modules/filesystem/DirectoryEntrySync.cpp \
     Modules/filesystem/DirectoryReader.cpp \
     Modules/filesystem/DirectoryReaderSync.cpp \
+    Modules/filesystem/Entry.cpp \
+    Modules/filesystem/EntryArray.cpp \
+    Modules/filesystem/EntryArraySync.cpp \
+    Modules/filesystem/EntryBase.cpp \
+    Modules/filesystem/EntrySync.cpp \
+    Modules/filesystem/FileEntry.cpp \
+    Modules/filesystem/FileEntrySync.cpp \
+    Modules/filesystem/FileWriter.cpp \
+    Modules/filesystem/FileWriterBase.cpp \
+    Modules/filesystem/FileWriterSync.cpp \
+    Modules/filesystem/LocalFileSystem.cpp \
+    Modules/filesystem/WorkerContextFileSystem.cpp \
     css/CSSAspectRatioValue.cpp \
     css/CSSBorderImageSliceValue.cpp \
     css/CSSBorderImage.cpp \
@@ -668,32 +684,16 @@ SOURCES += \
     fileapi/AsyncFileStream.cpp \
     fileapi/Blob.cpp \
     fileapi/BlobURL.cpp \
-    fileapi/DOMFilePath.cpp \
-    fileapi/DOMFileSystem.cpp \
-    fileapi/DOMFileSystemBase.cpp \
-    fileapi/DOMFileSystemSync.cpp \
-    fileapi/Entry.cpp \
-    fileapi/EntryArray.cpp \
-    fileapi/EntryArraySync.cpp \
-    fileapi/EntryBase.cpp \
-    fileapi/EntrySync.cpp \
     fileapi/File.cpp \
-    fileapi/FileEntry.cpp \
-    fileapi/FileEntrySync.cpp \
     fileapi/FileException.cpp \
     fileapi/FileList.cpp \
     fileapi/FileReader.cpp \
     fileapi/FileReaderLoader.cpp \
     fileapi/FileReaderSync.cpp \
     fileapi/FileThread.cpp \
-    fileapi/FileWriter.cpp \
-    fileapi/FileWriterBase.cpp \
-    fileapi/FileWriterSync.cpp \
-    fileapi/LocalFileSystem.cpp \
     fileapi/OperationNotAllowedException.cpp \
     fileapi/ThreadableBlobRegistry.cpp \
     fileapi/WebKitBlobBuilder.cpp \
-    fileapi/WorkerContextFileSystem.cpp \
     history/BackForwardController.cpp \
     history/BackForwardListImpl.cpp \
     history/CachedFrame.cpp \
@@ -3057,39 +3057,39 @@ contains(DEFINES, ENABLE_DATA_TRANSFER_ITEMS=1) {
 
 contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
     HEADERS += \
-        fileapi/AsyncFileWriter.h \
+        Modules/filesystem/AsyncFileWriter.h \
+        Modules/filesystem/DOMFilePath.h \
+        Modules/filesystem/DOMFileSystem.h \
+        Modules/filesystem/DOMFileSystemBase.h \
+        Modules/filesystem/DOMFileSystemSync.h \
         Modules/filesystem/DirectoryEntry.h \
         Modules/filesystem/DirectoryEntrySync.h \
         Modules/filesystem/DirectoryReader.h \
         Modules/filesystem/DirectoryReaderBase.h \
         Modules/filesystem/DirectoryReaderSync.h \
         Modules/filesystem/EntriesCallback.h \
-        fileapi/DOMFilePath.h \
-        fileapi/DOMFileSystem.h \
-        fileapi/DOMFileSystemBase.h \
-        fileapi/DOMFileSystemSync.h \
-        fileapi/Entry.h \
-        fileapi/EntryArray.h \
-        fileapi/EntryArraySync.h \
-        fileapi/EntryBase.h \
-        fileapi/EntryCallback.h \
-        fileapi/EntrySync.h \
-        fileapi/ErrorCallback.h \
-        fileapi/FileCallback.h \
-        fileapi/FileEntry.h \
-        fileapi/FileEntrySync.h \
-        fileapi/FileSystemCallback.h \
-        fileapi/FileSystemCallbacks.h \
-        fileapi/FileWriter.h \
-        fileapi/FileWriterBase.h \
-        fileapi/FileWriterBaseCallback.h \
-        fileapi/FileWriterCallback.h \
-        fileapi/FileWriterClient.h \
-        fileapi/FileWriterSync.h \
-        fileapi/WebKitFlags.h \
-        fileapi/LocalFileSystem.h \
-        fileapi/Metadata.h \
-        fileapi/MetadataCallback.h \
+        Modules/filesystem/Entry.h \
+        Modules/filesystem/EntryArray.h \
+        Modules/filesystem/EntryArraySync.h \
+        Modules/filesystem/EntryBase.h \
+        Modules/filesystem/EntryCallback.h \
+        Modules/filesystem/EntrySync.h \
+        Modules/filesystem/ErrorCallback.h \
+        Modules/filesystem/FileCallback.h \
+        Modules/filesystem/FileEntry.h \
+        Modules/filesystem/FileEntrySync.h \
+        Modules/filesystem/FileSystemCallback.h \
+        Modules/filesystem/FileSystemCallbacks.h \
+        Modules/filesystem/FileWriter.h \
+        Modules/filesystem/FileWriterBase.h \
+        Modules/filesystem/FileWriterBaseCallback.h \
+        Modules/filesystem/FileWriterCallback.h \
+        Modules/filesystem/FileWriterClient.h \
+        Modules/filesystem/FileWriterSync.h \
+        Modules/filesystem/WebKitFlags.h \
+        Modules/filesystem/LocalFileSystem.h \
+        Modules/filesystem/Metadata.h \
+        Modules/filesystem/MetadataCallback.h \
         platform/AsyncFileSystem.h \
         platform/AsyncFileSystemCallbacks.h \
         platform/FileMetadata.h

diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp
index 2fd5328778573016154201494c5795047525eebf..0377a88bdb65b9e5800652ebd3a6c23b20bfe1e0 100644 (file)
--- a/Source/WebCore/WebCore.gyp/WebCore.gyp
+++ b/Source/WebCore/WebCore.gyp/WebCore.gyp
@@ -1804,6 +1804,7 @@
 
         ['exclude', 'AllInOne\\.cpp$'],
 
+        ['exclude', 'Modules/filesystem/LocalFileSystem\\.cpp$'],
         ['exclude', 'Modules/indexeddb/IDBFactoryBackendInterface\\.cpp$'],
         ['exclude', 'Modules/indexeddb/IDBKeyPathBackendImpl\\.cpp$'],
         ['exclude', 'Modules/webdatabase/DatabaseTrackerClient\\.h$'],
@@ -1811,7 +1812,6 @@
         ['exclude', 'Modules/webdatabase/OriginQuotaManager\\.(cpp|h)$'],
         ['exclude', 'Modules/webdatabase/OriginUsageRecord\\.(cpp|h)$'],
         ['exclude', 'Modules/webdatabase/SQLTransactionClient\\.cpp$'],
-        ['exclude', 'fileapi/LocalFileSystem\\.cpp$'],
         ['exclude', 'inspector/InspectorFrontendClientLocal\\.cpp$'],
         ['exclude', 'inspector/JavaScript[^/]*\\.cpp$'],
         ['exclude', 'loader/UserStyleSheetLoader\\.cpp$'],

diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 518a3f2e41553a80284085dffc3064123a964ce8..bc8736546fc7b3d5adbe1d157f01032735651ac4 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -728,11 +728,34 @@
             'svg/properties/SVGTransformListPropertyTearOff.h',
         ],
         'webcore_bindings_idl_files': [
+            'Modules/filesystem/DOMFileSystem.idl',
+            'Modules/filesystem/DOMFileSystemSync.idl',
             'Modules/filesystem/DOMWindowFileSystem.idl',
             'Modules/filesystem/DirectoryEntry.idl',
             'Modules/filesystem/DirectoryEntrySync.idl',
             'Modules/filesystem/DirectoryReader.idl',
             'Modules/filesystem/DirectoryReaderSync.idl',
+            'Modules/filesystem/DirectoryEntry.idl',
+            'Modules/filesystem/DirectoryEntrySync.idl',
+            'Modules/filesystem/DirectoryReader.idl',
+            'Modules/filesystem/DirectoryReaderSync.idl',
+            'Modules/filesystem/EntriesCallback.idl',
+            'Modules/filesystem/Entry.idl',
+            'Modules/filesystem/EntryArray.idl',
+            'Modules/filesystem/EntryArraySync.idl',
+            'Modules/filesystem/EntryCallback.idl',
+            'Modules/filesystem/EntrySync.idl',
+            'Modules/filesystem/ErrorCallback.idl',
+            'Modules/filesystem/FileCallback.idl',
+            'Modules/filesystem/FileEntry.idl',
+            'Modules/filesystem/FileEntrySync.idl',
+            'Modules/filesystem/FileSystemCallback.idl',
+            'Modules/filesystem/FileWriter.idl',
+            'Modules/filesystem/FileWriterCallback.idl',
+            'Modules/filesystem/FileWriterSync.idl',
+            'Modules/filesystem/Metadata.idl',
+            'Modules/filesystem/MetadataCallback.idl',
+            'Modules/filesystem/WorkerContextFileSystem.idl',
             'Modules/gamepad/Gamepad.idl',
             'Modules/gamepad/GamepadList.idl',
             'Modules/gamepad/NavigatorGamepad.idl',
@@ -901,37 +924,14 @@
             'dom/WebKitTransitionEvent.idl',
             'dom/WheelEvent.idl',
             'fileapi/Blob.idl',
-            'Modules/filesystem/DirectoryEntry.idl',
-            'Modules/filesystem/DirectoryEntrySync.idl',
-            'Modules/filesystem/DirectoryReader.idl',
-            'Modules/filesystem/DirectoryReaderSync.idl',
-            'fileapi/DOMFileSystem.idl',
-            'fileapi/DOMFileSystemSync.idl',
-            'Modules/filesystem/EntriesCallback.idl',
-            'fileapi/Entry.idl',
-            'fileapi/EntryArray.idl',
-            'fileapi/EntryArraySync.idl',
-            'fileapi/EntryCallback.idl',
-            'fileapi/EntrySync.idl',
-            'fileapi/ErrorCallback.idl',
             'fileapi/File.idl',
-            'fileapi/FileCallback.idl',
-            'fileapi/FileEntry.idl',
-            'fileapi/FileEntrySync.idl',
             'fileapi/FileError.idl',
             'fileapi/FileException.idl',
             'fileapi/FileList.idl',
             'fileapi/FileReader.idl',
             'fileapi/FileReaderSync.idl',
-            'fileapi/FileSystemCallback.idl',
-            'fileapi/FileWriter.idl',
-            'fileapi/FileWriterCallback.idl',
-            'fileapi/FileWriterSync.idl',
             'fileapi/OperationNotAllowedException.idl',
-            'fileapi/Metadata.idl',
-            'fileapi/MetadataCallback.idl',
             'fileapi/WebKitBlobBuilder.idl',
-            'fileapi/WorkerContextFileSystem.idl',
             'html/DOMFormData.idl',
             'html/DOMSettableTokenList.idl',
             'html/DOMTokenList.idl',
@@ -1306,6 +1306,14 @@
             'svg/SVGZoomEvent.idl',
         ],
         'webcore_files': [
+            'Modules/filesystem/DOMFilePath.cpp',
+            'Modules/filesystem/DOMFilePath.h',
+            'Modules/filesystem/DOMFileSystem.cpp',
+            'Modules/filesystem/DOMFileSystem.h',
+            'Modules/filesystem/DOMFileSystemBase.cpp',
+            'Modules/filesystem/DOMFileSystemBase.h',
+            'Modules/filesystem/DOMFileSystemSync.cpp',
+            'Modules/filesystem/DOMFileSystemSync.h',
             'Modules/filesystem/DOMWindowFileSystem.cpp',
             'Modules/filesystem/DOMWindowFileSystem.h',
             'Modules/filesystem/DirectoryEntry.cpp',
@@ -1317,6 +1325,43 @@
             'Modules/filesystem/DirectoryReaderBase.h',
             'Modules/filesystem/DirectoryReaderSync.cpp',
             'Modules/filesystem/DirectoryReaderSync.h',
+            'Modules/filesystem/EntriesCallback.h',
+            'Modules/filesystem/Entry.cpp',
+            'Modules/filesystem/Entry.h',
+            'Modules/filesystem/EntryArray.cpp',
+            'Modules/filesystem/EntryArray.h',
+            'Modules/filesystem/EntryArraySync.cpp',
+            'Modules/filesystem/EntryArraySync.h',
+            'Modules/filesystem/EntryBase.cpp',
+            'Modules/filesystem/EntryBase.h',
+            'Modules/filesystem/EntryCallback.h',
+            'Modules/filesystem/EntrySync.cpp',
+            'Modules/filesystem/EntrySync.h',
+            'Modules/filesystem/ErrorCallback.h',
+            'Modules/filesystem/FileCallback.h',
+            'Modules/filesystem/FileEntry.cpp',
+            'Modules/filesystem/FileEntry.h',
+            'Modules/filesystem/FileEntrySync.cpp',
+            'Modules/filesystem/FileEntrySync.h',
+            'Modules/filesystem/FileSystemCallback.h',
+            'Modules/filesystem/FileSystemCallbacks.cpp',
+            'Modules/filesystem/FileSystemCallbacks.h',
+            'Modules/filesystem/FileWriter.cpp',
+            'Modules/filesystem/FileWriter.h',
+            'Modules/filesystem/FileWriterBase.cpp',
+            'Modules/filesystem/FileWriterBase.h',
+            'Modules/filesystem/FileWriterBaseCallback.h',
+            'Modules/filesystem/FileWriterCallback.h',
+            'Modules/filesystem/FileWriterSync.cpp',
+            'Modules/filesystem/FileWriterSync.h',
+            'Modules/filesystem/LocalFileSystem.cpp',
+            'Modules/filesystem/LocalFileSystem.h',
+            'Modules/filesystem/Metadata.h',
+            'Modules/filesystem/MetadataCallback.h',
+            'Modules/filesystem/SyncCallbackHelper.h',
+            'Modules/filesystem/WebKitFlags.h',
+            'Modules/filesystem/WorkerContextFileSystem.cpp',
+            'Modules/filesystem/WorkerContextFileSystem.h',
             'Modules/gamepad/Gamepad.cpp',
             'Modules/gamepad/Gamepad.h',
             'Modules/gamepad/GamepadList.cpp',
@@ -2466,43 +2511,8 @@
             'fileapi/Blob.h',
             'fileapi/BlobURL.cpp',
             'fileapi/BlobURL.h',
-            'fileapi/DOMFilePath.cpp',
-            'fileapi/DOMFilePath.h',
-            'fileapi/DOMFileSystem.cpp',
-            'fileapi/DOMFileSystem.h',
-            'fileapi/DOMFileSystemBase.cpp',
-            'fileapi/DOMFileSystemBase.h',
-            'fileapi/DOMFileSystemSync.cpp',
-            'fileapi/DOMFileSystemSync.h',
-            'Modules/filesystem/DirectoryEntry.cpp',
-            'Modules/filesystem/DirectoryEntry.h',
-            'Modules/filesystem/DirectoryEntrySync.cpp',
-            'Modules/filesystem/DirectoryEntrySync.h',
-            'Modules/filesystem/DirectoryReader.cpp',
-            'Modules/filesystem/DirectoryReader.h',
-            'Modules/filesystem/DirectoryReaderBase.h',
-            'Modules/filesystem/DirectoryReaderSync.cpp',
-            'Modules/filesystem/DirectoryReaderSync.h',
-            'Modules/filesystem/EntriesCallback.h',
-            'fileapi/Entry.cpp',
-            'fileapi/Entry.h',
-            'fileapi/EntryArray.cpp',
-            'fileapi/EntryArray.h',
-            'fileapi/EntryArraySync.cpp',
-            'fileapi/EntryArraySync.h',
-            'fileapi/EntryBase.cpp',
-            'fileapi/EntryBase.h',
-            'fileapi/EntryCallback.h',
-            'fileapi/EntrySync.cpp',
-            'fileapi/EntrySync.h',
-            'fileapi/ErrorCallback.h',
             'fileapi/File.cpp',
             'fileapi/File.h',
-            'fileapi/FileCallback.h',
-            'fileapi/FileEntry.cpp',
-            'fileapi/FileEntry.h',
-            'fileapi/FileEntrySync.cpp',
-            'fileapi/FileEntrySync.h',
             'fileapi/FileError.h',
             'fileapi/FileException.cpp',
             'fileapi/FileException.h',
@@ -2515,30 +2525,11 @@
             'fileapi/FileReaderLoaderClient.h',
             'fileapi/FileReaderSync.cpp',
             'fileapi/FileReaderSync.h',
-            'fileapi/FileSystemCallback.h',
-            'fileapi/FileSystemCallbacks.cpp',
-            'fileapi/FileSystemCallbacks.h',
             'fileapi/FileThread.cpp',
             'fileapi/FileThread.h',
             'fileapi/FileThreadTask.h',
-            'fileapi/FileWriter.cpp',
-            'fileapi/FileWriter.h',
-            'fileapi/FileWriterBase.cpp',
-            'fileapi/FileWriterBase.h',
-            'fileapi/FileWriterBaseCallback.h',
-            'fileapi/FileWriterCallback.h',
-            'fileapi/FileWriterSync.cpp',
-            'fileapi/FileWriterSync.h',
-            'fileapi/WebKitFlags.h',
-            'fileapi/WorkerContextFileSystem.cpp',
-            'fileapi/WorkerContextFileSystem.h',
-            'fileapi/LocalFileSystem.cpp',
-            'fileapi/LocalFileSystem.h',
-            'fileapi/Metadata.h',
-            'fileapi/MetadataCallback.h',
             'fileapi/OperationNotAllowedException.cpp',
             'fileapi/OperationNotAllowedException.h',
-            'fileapi/SyncCallbackHelper.h',
             'fileapi/ThreadableBlobRegistry.cpp',
             'fileapi/ThreadableBlobRegistry.h',
             'fileapi/WebKitBlobBuilder.cpp',

diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index be0319c8c2974601e1bbcfc934bb007e02894223..075c69b8f24f1905e61fd4c363166d7684ed42af 100755 (executable)
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -24056,6 +24056,54 @@
                         <Filter
                                 Name="filesystem"
                                 >
+                               <File
+                                       RelativePath="..\Modules\filesystem\AsyncFileWriter.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\AsyncFileWriterClient.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFilePath.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFilePath.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFileSystem.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFileSystem.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFileSystemBase.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFileSystemBase.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFileSystemSync.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMFileSystemSync.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMWindowFileSystem.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\DOMWindowFileSystem.h"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\Modules\filesystem\DirectoryEntry.cpp"
                                        >
@@ -24097,11 +24145,151 @@
                                        >
                                </File>
                                <File
-                                       RelativePath="..\Modules\filesystem\DOMWindowFileSystem.cpp"
+                                       RelativePath="..\Modules\filesystem\EntryBase.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\Modules\filesystem\DOMWindowFileSystem.h"
+                                       RelativePath="..\Modules\filesystem\Entry.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\Entry.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntryArray.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntryArray.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntryArraySync.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntryArraySync.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntryBase.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntryCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntrySync.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\EntrySync.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\ErrorCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileEntry.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileEntry.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileEntrySync.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileEntrySync.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileError.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileSystemCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileSystemCallbacks.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileSystemCallbacks.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriter.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriter.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriterBase.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriterBase.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriterBaseCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriterCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriterSync.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\FileWriterSync.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\LocalFileSystem.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\LocalFileSystem.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\Metadata.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\MetadataCallback.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\SyncCallbackHelper.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\WebKitFlags.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\WorkerContextFileSystem.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\filesystem\WorkerContextFileSystem.h"
                                        >
                                </File>
                         </Filter>
@@ -56765,14 +56953,6 @@
                                RelativePath="..\fileapi\AsyncFileStream.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\AsyncFileWriter.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\AsyncFileWriterClient.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\BaseButtonInputType.cpp"
                                >
@@ -56945,38 +57125,6 @@
                                RelativePath="..\html\DateTimeLocalInputType.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFilePath.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFilePath.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFileSystem.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFileSystem.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFileSystemBase.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFileSystemBase.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFileSystemSync.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\DOMFileSystemSync.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\DOMFormData.cpp"
                                >
@@ -57017,50 +57165,6 @@
                                RelativePath="..\html\EmailInputType.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\Entry.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\Entry.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntryArray.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntryArray.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntryArraySync.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntryArraySync.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntryBase.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntryCallback.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntrySync.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\EntrySync.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\ErrorCallback.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\fileapi\File.cpp"
                                >
@@ -57069,30 +57173,6 @@
                                RelativePath="..\fileapi\File.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\FileCallback.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileEntry.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileEntry.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileEntrySync.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileEntrySync.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileError.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\fileapi\FileException.cpp"
                                >
@@ -57145,18 +57225,6 @@
                                RelativePath="..\fileapi\FileReaderSync.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\FileSystemCallback.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileSystemCallbacks.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileSystemCallbacks.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\fileapi\FileThread.cpp"
                                >
@@ -57169,38 +57237,6 @@
                                RelativePath="..\fileapi\FileThreadTask.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriter.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriter.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriterBase.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriterBase.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriterBaseCallback.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriterCallback.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriterSync.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\FileWriterSync.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\FormAssociatedElement.cpp"
                                >
@@ -61537,14 +61573,6 @@
                                RelativePath="..\html\LinkRelAttribute.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\LocalFileSystem.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\LocalFileSystem.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\MediaController.cpp"
                                >
@@ -61573,14 +61601,6 @@
                                RelativePath="..\html\MediaFragmentURIParser.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\Metadata.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\MetadataCallback.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\MicroDataItemValue.cpp"
                                >
@@ -61765,10 +61785,6 @@
                                RelativePath="..\html\VoidCallback.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\fileapi\WebKitFlags.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\html\WeekInputType.cpp"
                                >
@@ -74210,26 +74226,6 @@
                                >
                        </File>
                </Filter>
-               <Filter
-                       Name="fileapi"
-                       >
-                       <File
-                               RelativePath="..\fileapi\EntryBase.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\SyncCallbackHelper.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\WorkerContextFileSystem.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fileapi\WorkerContextFileSystem.h"
-                               >
-                       </File>
-               </Filter>
                <File
                        RelativePath="..\config.h"
                        >

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 0317193e3a64457fc0254af82a666d0709e75132..9063f2efb49edb0418780bb8b6c2c4d85bf48262 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -7116,9 +7116,9 @@
                14993BE30B2F2B1C0050497F /* FocusController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FocusController.cpp; sourceTree = "<group>"; };
                14993BE40B2F2B1C0050497F /* FocusController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FocusController.h; sourceTree = "<group>"; };
                14A98E05136386A200C9FED2 /* Blob.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Blob.idl; path = fileapi/Blob.idl; sourceTree = SOURCE_ROOT; };
-               14BDF5971365392C00148393 /* DOMFileSystem.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMFileSystem.idl; path = fileapi/DOMFileSystem.idl; sourceTree = SOURCE_ROOT; };
+               14BDF5971365392C00148393 /* DOMFileSystem.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMFileSystem.idl; path = Modules/filesystem/DOMFileSystem.idl; sourceTree = SOURCE_ROOT; };
                14BDF59A1365399100148393 /* FileReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FileReader.idl; path = fileapi/FileReader.idl; sourceTree = SOURCE_ROOT; };
-               14BDF59C136539BE00148393 /* FileWriter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FileWriter.idl; path = fileapi/FileWriter.idl; sourceTree = SOURCE_ROOT; };
+               14BDF59C136539BE00148393 /* FileWriter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FileWriter.idl; path = Modules/filesystem/FileWriter.idl; sourceTree = SOURCE_ROOT; };
                14C9A5E90B3D105F005A0232 /* Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cpp; sourceTree = "<group>"; };
                14CD8D81106B529000A46D23 /* JSSharedWorkerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSharedWorkerCustom.cpp; sourceTree = "<group>"; };
                14CF787109F587CA00EB3665 /* CSSValue.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValue.idl; sourceTree = "<group>"; };
@@ -8079,12 +8079,12 @@
                450CEBEF15073BBE002BB149 /* LabelableElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelableElement.h; sourceTree = "<group>"; };
                45BAC2AF1360BBAB005DA258 /* IconURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconURL.h; sourceTree = "<group>"; };
                4614A1FD0B23A8D600446E1C /* copyCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = copyCursor.png; sourceTree = "<group>"; };
-               46700ECE127B96CB00F5D5D6 /* FileWriterSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriterSync.cpp; path = fileapi/FileWriterSync.cpp; sourceTree = "<group>"; };
-               46700ECF127B96CB00F5D5D6 /* FileWriterSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterSync.h; path = fileapi/FileWriterSync.h; sourceTree = "<group>"; };
+               46700ECE127B96CB00F5D5D6 /* FileWriterSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriterSync.cpp; path = Modules/filesystem/FileWriterSync.cpp; sourceTree = "<group>"; };
+               46700ECF127B96CB00F5D5D6 /* FileWriterSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterSync.h; path = Modules/filesystem/FileWriterSync.h; sourceTree = "<group>"; };
                4689F1AE1267BAE100E8D380 /* FileMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMetadata.h; path = platform/FileMetadata.h; sourceTree = "<group>"; };
-               46BC724B129B104C0071C07E /* FileWriterBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriterBase.cpp; path = fileapi/FileWriterBase.cpp; sourceTree = "<group>"; };
-               46BC724C129B104C0071C07E /* FileWriterBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterBase.h; path = fileapi/FileWriterBase.h; sourceTree = "<group>"; };
-               46BC724D129B104C0071C07E /* FileWriterBaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterBaseCallback.h; path = fileapi/FileWriterBaseCallback.h; sourceTree = "<group>"; };
+               46BC724B129B104C0071C07E /* FileWriterBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriterBase.cpp; path = Modules/filesystem/FileWriterBase.cpp; sourceTree = "<group>"; };
+               46BC724C129B104C0071C07E /* FileWriterBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterBase.h; path = Modules/filesystem/FileWriterBase.h; sourceTree = "<group>"; };
+               46BC724D129B104C0071C07E /* FileWriterBaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterBaseCallback.h; path = Modules/filesystem/FileWriterBaseCallback.h; sourceTree = "<group>"; };
                46BD16E20B279473001F0839 /* noneCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = noneCursor.png; sourceTree = "<group>"; };
                46D4F2460AF97E810035385A /* cellCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cellCursor.png; sourceTree = "<group>"; };
                46D4F2470AF97E810035385A /* contextMenuCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contextMenuCursor.png; sourceTree = "<group>"; };
@@ -9789,8 +9789,8 @@
                892CF209134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorageInfoUsageCallback.cpp; sourceTree = "<group>"; };
                892CF20A134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStorageInfoUsageCallback.h; sourceTree = "<group>"; };
                8931DE5A14C44C44000DC9D2 /* JSBlobCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlobCustom.cpp; sourceTree = "<group>"; };
-               893C47A51238908B002B3D86 /* FileCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileCallback.h; path = fileapi/FileCallback.h; sourceTree = "<group>"; };
-               893C47A61238908B002B3D86 /* FileWriterCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterCallback.h; path = fileapi/FileWriterCallback.h; sourceTree = "<group>"; };
+               893C47A51238908B002B3D86 /* FileCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileCallback.h; path = Modules/filesystem/FileCallback.h; sourceTree = "<group>"; };
+               893C47A61238908B002B3D86 /* FileWriterCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterCallback.h; path = Modules/filesystem/FileWriterCallback.h; sourceTree = "<group>"; };
                893C47B51238A099002B3D86 /* JSFileCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileCallback.cpp; sourceTree = "<group>"; };
                893C47B61238A099002B3D86 /* JSFileCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileCallback.h; sourceTree = "<group>"; };
                893C47B91238A0A9002B3D86 /* JSFileWriterCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileWriterCallback.cpp; sourceTree = "<group>"; };
@@ -9801,17 +9801,17 @@
                893C47F11248BD39002B3D86 /* DirectoryEntrySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryEntrySync.h; path = Modules/filesystem/DirectoryEntrySync.h; sourceTree = "<group>"; };
                893C47F21248BD39002B3D86 /* DirectoryReaderSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryReaderSync.cpp; path = Modules/filesystem/DirectoryReaderSync.cpp; sourceTree = "<group>"; };
                893C47F31248BD39002B3D86 /* DirectoryReaderSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryReaderSync.h; path = Modules/filesystem/DirectoryReaderSync.h; sourceTree = "<group>"; };
-               893C47F41248BD39002B3D86 /* DOMFileSystemBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystemBase.cpp; path = fileapi/DOMFileSystemBase.cpp; sourceTree = "<group>"; };
-               893C47F51248BD39002B3D86 /* DOMFileSystemBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystemBase.h; path = fileapi/DOMFileSystemBase.h; sourceTree = "<group>"; };
-               893C47F61248BD39002B3D86 /* DOMFileSystemSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystemSync.cpp; path = fileapi/DOMFileSystemSync.cpp; sourceTree = "<group>"; };
-               893C47F71248BD39002B3D86 /* DOMFileSystemSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystemSync.h; path = fileapi/DOMFileSystemSync.h; sourceTree = "<group>"; };
-               893C47F81248BD39002B3D86 /* EntryArraySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryArraySync.cpp; path = fileapi/EntryArraySync.cpp; sourceTree = "<group>"; };
-               893C47F91248BD39002B3D86 /* EntryArraySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryArraySync.h; path = fileapi/EntryArraySync.h; sourceTree = "<group>"; };
-               893C47FB1248BD39002B3D86 /* EntryBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryBase.h; path = fileapi/EntryBase.h; sourceTree = "<group>"; };
-               893C47FC1248BD39002B3D86 /* EntrySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntrySync.cpp; path = fileapi/EntrySync.cpp; sourceTree = "<group>"; };
-               893C47FD1248BD39002B3D86 /* EntrySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntrySync.h; path = fileapi/EntrySync.h; sourceTree = "<group>"; };
-               893C47FE1248BD39002B3D86 /* FileEntrySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileEntrySync.cpp; path = fileapi/FileEntrySync.cpp; sourceTree = "<group>"; };
-               893C47FF1248BD39002B3D86 /* FileEntrySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileEntrySync.h; path = fileapi/FileEntrySync.h; sourceTree = "<group>"; };
+               893C47F41248BD39002B3D86 /* DOMFileSystemBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystemBase.cpp; path = Modules/filesystem/DOMFileSystemBase.cpp; sourceTree = "<group>"; };
+               893C47F51248BD39002B3D86 /* DOMFileSystemBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystemBase.h; path = Modules/filesystem/DOMFileSystemBase.h; sourceTree = "<group>"; };
+               893C47F61248BD39002B3D86 /* DOMFileSystemSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystemSync.cpp; path = Modules/filesystem/DOMFileSystemSync.cpp; sourceTree = "<group>"; };
+               893C47F71248BD39002B3D86 /* DOMFileSystemSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystemSync.h; path = Modules/filesystem/DOMFileSystemSync.h; sourceTree = "<group>"; };
+               893C47F81248BD39002B3D86 /* EntryArraySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryArraySync.cpp; path = Modules/filesystem/EntryArraySync.cpp; sourceTree = "<group>"; };
+               893C47F91248BD39002B3D86 /* EntryArraySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryArraySync.h; path = Modules/filesystem/EntryArraySync.h; sourceTree = "<group>"; };
+               893C47FB1248BD39002B3D86 /* EntryBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryBase.h; path = Modules/filesystem/EntryBase.h; sourceTree = "<group>"; };
+               893C47FC1248BD39002B3D86 /* EntrySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntrySync.cpp; path = Modules/filesystem/EntrySync.cpp; sourceTree = "<group>"; };
+               893C47FD1248BD39002B3D86 /* EntrySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntrySync.h; path = Modules/filesystem/EntrySync.h; sourceTree = "<group>"; };
+               893C47FE1248BD39002B3D86 /* FileEntrySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileEntrySync.cpp; path = Modules/filesystem/FileEntrySync.cpp; sourceTree = "<group>"; };
+               893C47FF1248BD39002B3D86 /* FileEntrySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileEntrySync.h; path = Modules/filesystem/FileEntrySync.h; sourceTree = "<group>"; };
                893C48201249535B002B3D86 /* JSDirectoryEntrySyncCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDirectoryEntrySyncCustom.cpp; sourceTree = "<group>"; };
                893C482612495472002B3D86 /* JSDirectoryEntrySync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDirectoryEntrySync.cpp; sourceTree = "<group>"; };
                893C482712495472002B3D86 /* JSDirectoryEntrySync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDirectoryEntrySync.h; sourceTree = "<group>"; };
@@ -9830,27 +9830,27 @@
                8987853A122CA064003AABDA /* DirectoryEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryEntry.h; path = Modules/filesystem/DirectoryEntry.h; sourceTree = "<group>"; };
                8987853B122CA064003AABDA /* DirectoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryReader.cpp; path = Modules/filesystem/DirectoryReader.cpp; sourceTree = "<group>"; };
                8987853C122CA064003AABDA /* DirectoryReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryReader.h; path = Modules/filesystem/DirectoryReader.h; sourceTree = "<group>"; };
-               8987853D122CA064003AABDA /* DOMFilePath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFilePath.cpp; path = fileapi/DOMFilePath.cpp; sourceTree = "<group>"; };
-               8987853E122CA064003AABDA /* DOMFilePath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFilePath.h; path = fileapi/DOMFilePath.h; sourceTree = "<group>"; };
-               8987853F122CA064003AABDA /* DOMFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystem.cpp; path = fileapi/DOMFileSystem.cpp; sourceTree = "<group>"; };
-               89878540122CA064003AABDA /* DOMFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystem.h; path = fileapi/DOMFileSystem.h; sourceTree = "<group>"; };
+               8987853D122CA064003AABDA /* DOMFilePath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFilePath.cpp; path = Modules/filesystem/DOMFilePath.cpp; sourceTree = "<group>"; };
+               8987853E122CA064003AABDA /* DOMFilePath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFilePath.h; path = Modules/filesystem/DOMFilePath.h; sourceTree = "<group>"; };
+               8987853F122CA064003AABDA /* DOMFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystem.cpp; path = Modules/filesystem/DOMFileSystem.cpp; sourceTree = "<group>"; };
+               89878540122CA064003AABDA /* DOMFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystem.h; path = Modules/filesystem/DOMFileSystem.h; sourceTree = "<group>"; };
                89878541122CA064003AABDA /* EntriesCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntriesCallback.h; path = Modules/filesystem/EntriesCallback.h; sourceTree = "<group>"; };
-               89878542122CA064003AABDA /* Entry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Entry.cpp; path = fileapi/Entry.cpp; sourceTree = "<group>"; };
-               89878543122CA064003AABDA /* Entry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Entry.h; path = fileapi/Entry.h; sourceTree = "<group>"; };
-               89878544122CA064003AABDA /* EntryArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryArray.cpp; path = fileapi/EntryArray.cpp; sourceTree = "<group>"; };
-               89878545122CA064003AABDA /* EntryArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryArray.h; path = fileapi/EntryArray.h; sourceTree = "<group>"; };
-               89878546122CA064003AABDA /* EntryCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryCallback.h; path = fileapi/EntryCallback.h; sourceTree = "<group>"; };
-               89878547122CA064003AABDA /* ErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ErrorCallback.h; path = fileapi/ErrorCallback.h; sourceTree = "<group>"; };
-               89878548122CA064003AABDA /* FileEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileEntry.cpp; path = fileapi/FileEntry.cpp; sourceTree = "<group>"; };
-               89878549122CA064003AABDA /* FileEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileEntry.h; path = fileapi/FileEntry.h; sourceTree = "<group>"; };
-               8987854A122CA064003AABDA /* FileSystemCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSystemCallback.h; path = fileapi/FileSystemCallback.h; sourceTree = "<group>"; };
-               8987854B122CA064003AABDA /* FileSystemCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSystemCallbacks.cpp; path = fileapi/FileSystemCallbacks.cpp; sourceTree = "<group>"; };
-               8987854C122CA064003AABDA /* FileSystemCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSystemCallbacks.h; path = fileapi/FileSystemCallbacks.h; sourceTree = "<group>"; };
-               8987854D122CA064003AABDA /* WebKitFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebKitFlags.h; path = fileapi/WebKitFlags.h; sourceTree = "<group>"; };
-               8987854E122CA064003AABDA /* LocalFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LocalFileSystem.cpp; path = fileapi/LocalFileSystem.cpp; sourceTree = "<group>"; };
-               8987854F122CA064003AABDA /* LocalFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LocalFileSystem.h; path = fileapi/LocalFileSystem.h; sourceTree = "<group>"; };
-               89878550122CA064003AABDA /* Metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Metadata.h; path = fileapi/Metadata.h; sourceTree = "<group>"; };
-               89878551122CA064003AABDA /* MetadataCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MetadataCallback.h; path = fileapi/MetadataCallback.h; sourceTree = "<group>"; };
+               89878542122CA064003AABDA /* Entry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Entry.cpp; path = Modules/filesystem/Entry.cpp; sourceTree = "<group>"; };
+               89878543122CA064003AABDA /* Entry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Entry.h; path = Modules/filesystem/Entry.h; sourceTree = "<group>"; };
+               89878544122CA064003AABDA /* EntryArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryArray.cpp; path = Modules/filesystem/EntryArray.cpp; sourceTree = "<group>"; };
+               89878545122CA064003AABDA /* EntryArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryArray.h; path = Modules/filesystem/EntryArray.h; sourceTree = "<group>"; };
+               89878546122CA064003AABDA /* EntryCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntryCallback.h; path = Modules/filesystem/EntryCallback.h; sourceTree = "<group>"; };
+               89878547122CA064003AABDA /* ErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ErrorCallback.h; path = Modules/filesystem/ErrorCallback.h; sourceTree = "<group>"; };
+               89878548122CA064003AABDA /* FileEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileEntry.cpp; path = Modules/filesystem/FileEntry.cpp; sourceTree = "<group>"; };
+               89878549122CA064003AABDA /* FileEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileEntry.h; path = Modules/filesystem/FileEntry.h; sourceTree = "<group>"; };
+               8987854A122CA064003AABDA /* FileSystemCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSystemCallback.h; path = Modules/filesystem/FileSystemCallback.h; sourceTree = "<group>"; };
+               8987854B122CA064003AABDA /* FileSystemCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSystemCallbacks.cpp; path = Modules/filesystem/FileSystemCallbacks.cpp; sourceTree = "<group>"; };
+               8987854C122CA064003AABDA /* FileSystemCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSystemCallbacks.h; path = Modules/filesystem/FileSystemCallbacks.h; sourceTree = "<group>"; };
+               8987854D122CA064003AABDA /* WebKitFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebKitFlags.h; path = Modules/filesystem/WebKitFlags.h; sourceTree = "<group>"; };
+               8987854E122CA064003AABDA /* LocalFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LocalFileSystem.cpp; path = Modules/filesystem/LocalFileSystem.cpp; sourceTree = "<group>"; };
+               8987854F122CA064003AABDA /* LocalFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LocalFileSystem.h; path = Modules/filesystem/LocalFileSystem.h; sourceTree = "<group>"; };
+               89878550122CA064003AABDA /* Metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Metadata.h; path = Modules/filesystem/Metadata.h; sourceTree = "<group>"; };
+               89878551122CA064003AABDA /* MetadataCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MetadataCallback.h; path = Modules/filesystem/MetadataCallback.h; sourceTree = "<group>"; };
                89878586122CA26A003AABDA /* JSDirectoryEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDirectoryEntry.cpp; sourceTree = "<group>"; };
                89878587122CA26A003AABDA /* JSDirectoryEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDirectoryEntry.h; sourceTree = "<group>"; };
                89878588122CA26A003AABDA /* JSDirectoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDirectoryReader.cpp; sourceTree = "<group>"; };
@@ -10359,7 +10359,7 @@
                9766504E144FBFFE00F6BB51 /* EventFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventFactory.cpp; sourceTree = "<group>"; };
                9767CE09145ABC12005E64DB /* ExceptionHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionHeaders.h; sourceTree = "<group>"; };
                9767CE0A145ABC13005E64DB /* ExceptionInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionInterfaces.h; sourceTree = "<group>"; };
-               976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriter.h; path = fileapi/AsyncFileWriter.h; sourceTree = "<group>"; };
+               976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriter.h; path = Modules/filesystem/AsyncFileWriter.h; sourceTree = "<group>"; };
                976D6C59122B8A3D001FD1F7 /* Blob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Blob.cpp; path = fileapi/Blob.cpp; sourceTree = "<group>"; };
                976D6C5A122B8A3D001FD1F7 /* Blob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Blob.h; path = fileapi/Blob.h; sourceTree = "<group>"; };
                976D6C5C122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebKitBlobBuilder.cpp; path = fileapi/WebKitBlobBuilder.cpp; sourceTree = "<group>"; };
@@ -10376,9 +10376,9 @@
                976D6C6E122B8A3D001FD1F7 /* FileThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileThread.cpp; path = fileapi/FileThread.cpp; sourceTree = "<group>"; };
                976D6C6F122B8A3D001FD1F7 /* FileThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileThread.h; path = fileapi/FileThread.h; sourceTree = "<group>"; };
                976D6C70122B8A3D001FD1F7 /* FileThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileThreadTask.h; path = fileapi/FileThreadTask.h; sourceTree = "<group>"; };
-               976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriter.cpp; path = fileapi/FileWriter.cpp; sourceTree = "<group>"; };
-               976D6C72122B8A3D001FD1F7 /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriter.h; path = fileapi/FileWriter.h; sourceTree = "<group>"; };
-               976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriterClient.h; path = fileapi/AsyncFileWriterClient.h; sourceTree = "<group>"; };
+               976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriter.cpp; path = Modules/filesystem/FileWriter.cpp; sourceTree = "<group>"; };
+               976D6C72122B8A3D001FD1F7 /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriter.h; path = Modules/filesystem/FileWriter.h; sourceTree = "<group>"; };
+               976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriterClient.h; path = Modules/filesystem/AsyncFileWriterClient.h; sourceTree = "<group>"; };
                976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableBlobRegistry.cpp; path = fileapi/ThreadableBlobRegistry.cpp; sourceTree = "<group>"; };
                976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableBlobRegistry.h; path = fileapi/ThreadableBlobRegistry.h; sourceTree = "<group>"; };
                976F36E814686225005E93B4 /* SecurityContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityContext.cpp; sourceTree = "<group>"; };
@@ -12734,7 +12734,7 @@
                C6F0902514327D4F00685849 /* JSWebKitMutationObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitMutationObserver.h; sourceTree = "<group>"; };
                C6F0917E143A2BB900685849 /* JSWebKitMutationObserverCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitMutationObserverCustom.cpp; sourceTree = "<group>"; };
                C6F09184143A6C3B00685849 /* JSMutationCallbackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMutationCallbackCustom.cpp; sourceTree = "<group>"; };
-               C6F41046130C6E8900393DE4 /* EntryBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryBase.cpp; path = fileapi/EntryBase.cpp; sourceTree = "<group>"; };
+               C6F41046130C6E8900393DE4 /* EntryBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryBase.cpp; path = Modules/filesystem/EntryBase.cpp; sourceTree = "<group>"; };
                CA3BF67B10D99BAE00E6CE53 /* ScrollAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollAnimator.cpp; sourceTree = "<group>"; };
                CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimator.h; sourceTree = "<group>"; };
                CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAspectRatioValue.cpp; sourceTree = "<group>"; };
@@ -12916,26 +12916,26 @@
                E1AB1EAC14E9E2F800449E13 /* DirectoryEntrySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DirectoryEntrySync.idl; path = Modules/filesystem/DirectoryEntrySync.idl; sourceTree = "<group>"; };
                E1AB1EAD14E9E30500449E13 /* DirectoryReader.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DirectoryReader.idl; path = Modules/filesystem/DirectoryReader.idl; sourceTree = "<group>"; };
                E1AB1EAE14E9E30B00449E13 /* DirectoryReaderSync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DirectoryReaderSync.idl; path = Modules/filesystem/DirectoryReaderSync.idl; sourceTree = "<group>"; };
-               E1AB1EAF14E9E31700449E13 /* DOMFileSystemSync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DOMFileSystemSync.idl; path = fileapi/DOMFileSystemSync.idl; sourceTree = "<group>"; };
-               E1AB1EB014E9E32300449E13 /* EntriesCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntriesCallback.idl; path = fileapi/EntriesCallback.idl; sourceTree = "<group>"; };
-               E1AB1EB114E9E32A00449E13 /* Entry.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = Entry.idl; path = fileapi/Entry.idl; sourceTree = "<group>"; };
-               E1AB1EB214E9E33200449E13 /* EntryArray.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntryArray.idl; path = fileapi/EntryArray.idl; sourceTree = "<group>"; };
-               E1AB1EB314E9E33900449E13 /* EntryArraySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntryArraySync.idl; path = fileapi/EntryArraySync.idl; sourceTree = "<group>"; };
-               E1AB1EB414E9E34500449E13 /* EntryCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntryCallback.idl; path = fileapi/EntryCallback.idl; sourceTree = "<group>"; };
-               E1AB1EB514E9E34B00449E13 /* EntrySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntrySync.idl; path = fileapi/EntrySync.idl; sourceTree = "<group>"; };
-               E1AB1EB614E9E35200449E13 /* ErrorCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = ErrorCallback.idl; path = fileapi/ErrorCallback.idl; sourceTree = "<group>"; };
+               E1AB1EAF14E9E31700449E13 /* DOMFileSystemSync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DOMFileSystemSync.idl; path = Modules/filesystem/DOMFileSystemSync.idl; sourceTree = "<group>"; };
+               E1AB1EB014E9E32300449E13 /* EntriesCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntriesCallback.idl; path = Modules/filesystem/EntriesCallback.idl; sourceTree = "<group>"; };
+               E1AB1EB114E9E32A00449E13 /* Entry.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = Entry.idl; path = Modules/filesystem/Entry.idl; sourceTree = "<group>"; };
+               E1AB1EB214E9E33200449E13 /* EntryArray.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntryArray.idl; path = Modules/filesystem/EntryArray.idl; sourceTree = "<group>"; };
+               E1AB1EB314E9E33900449E13 /* EntryArraySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntryArraySync.idl; path = Modules/filesystem/EntryArraySync.idl; sourceTree = "<group>"; };
+               E1AB1EB414E9E34500449E13 /* EntryCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntryCallback.idl; path = Modules/filesystem/EntryCallback.idl; sourceTree = "<group>"; };
+               E1AB1EB514E9E34B00449E13 /* EntrySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = EntrySync.idl; path = Modules/filesystem/EntrySync.idl; sourceTree = "<group>"; };
+               E1AB1EB614E9E35200449E13 /* ErrorCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = ErrorCallback.idl; path = Modules/filesystem/ErrorCallback.idl; sourceTree = "<group>"; };
                E1AB1EB714E9E35800449E13 /* File.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = File.idl; path = fileapi/File.idl; sourceTree = "<group>"; };
-               E1AB1EB814E9E36200449E13 /* FileCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileCallback.idl; path = fileapi/FileCallback.idl; sourceTree = "<group>"; };
-               E1AB1EB914E9E36D00449E13 /* FileEntry.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileEntry.idl; path = fileapi/FileEntry.idl; sourceTree = "<group>"; };
-               E1AB1EBA14E9E37200449E13 /* FileEntrySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileEntrySync.idl; path = fileapi/FileEntrySync.idl; sourceTree = "<group>"; };
+               E1AB1EB814E9E36200449E13 /* FileCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileCallback.idl; path = Modules/filesystem/FileCallback.idl; sourceTree = "<group>"; };
+               E1AB1EB914E9E36D00449E13 /* FileEntry.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileEntry.idl; path = Modules/filesystem/FileEntry.idl; sourceTree = "<group>"; };
+               E1AB1EBA14E9E37200449E13 /* FileEntrySync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileEntrySync.idl; path = Modules/filesystem/FileEntrySync.idl; sourceTree = "<group>"; };
                E1AB1EBB14E9E37A00449E13 /* FileError.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileError.idl; path = fileapi/FileError.idl; sourceTree = "<group>"; };
                E1AB1EBC14E9E39700449E13 /* FileException.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileException.idl; path = fileapi/FileException.idl; sourceTree = "<group>"; };
                E1AB1EBD14E9E3A800449E13 /* FileReaderSync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileReaderSync.idl; path = fileapi/FileReaderSync.idl; sourceTree = "<group>"; };
-               E1AB1EBE14E9E3B200449E13 /* FileSystemCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileSystemCallback.idl; path = fileapi/FileSystemCallback.idl; sourceTree = "<group>"; };
-               E1AB1EBF14E9E3BE00449E13 /* FileWriterCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileWriterCallback.idl; path = fileapi/FileWriterCallback.idl; sourceTree = "<group>"; };
-               E1AB1EC014E9E3C400449E13 /* FileWriterSync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileWriterSync.idl; path = fileapi/FileWriterSync.idl; sourceTree = "<group>"; };
-               E1AB1EC114E9E3CC00449E13 /* Metadata.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = Metadata.idl; path = fileapi/Metadata.idl; sourceTree = "<group>"; };
-               E1AB1EC214E9E3D500449E13 /* MetadataCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = MetadataCallback.idl; path = fileapi/MetadataCallback.idl; sourceTree = "<group>"; };
+               E1AB1EBE14E9E3B200449E13 /* FileSystemCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileSystemCallback.idl; path = Modules/filesystem/FileSystemCallback.idl; sourceTree = "<group>"; };
+               E1AB1EBF14E9E3BE00449E13 /* FileWriterCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileWriterCallback.idl; path = Modules/filesystem/FileWriterCallback.idl; sourceTree = "<group>"; };
+               E1AB1EC014E9E3C400449E13 /* FileWriterSync.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = FileWriterSync.idl; path = Modules/filesystem/FileWriterSync.idl; sourceTree = "<group>"; };
+               E1AB1EC114E9E3CC00449E13 /* Metadata.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = Metadata.idl; path = Modules/filesystem/Metadata.idl; sourceTree = "<group>"; };
+               E1AB1EC214E9E3D500449E13 /* MetadataCallback.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = MetadataCallback.idl; path = Modules/filesystem/MetadataCallback.idl; sourceTree = "<group>"; };
                E1AB1EC314E9E3E200449E13 /* WebKitBlobBuilder.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = WebKitBlobBuilder.idl; path = fileapi/WebKitBlobBuilder.idl; sourceTree = "<group>"; };
                E1ACAF4A0E791AAF0087D12B /* DOMMessagePort.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMMessagePort.mm; sourceTree = "<group>"; };
                E1ACAF4B0E791AAF0087D12B /* DOMMessagePort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMMessagePort.h; sourceTree = "<group>"; };