if (ENABLE_FILE_SYSTEM)
LIST(APPEND WebCore_SOURCES
+ Modules/filesystem/DOMWindowFileSystem.cpp
Modules/filesystem/DirectoryEntry.cpp
Modules/filesystem/DirectoryEntrySync.cpp
Modules/filesystem/DirectoryReader.cpp
fileapi/DOMFileSystem.cpp
fileapi/DOMFileSystemBase.cpp
fileapi/DOMFileSystemSync.cpp
- fileapi/DOMWindowFileSystem.cpp
fileapi/Entry.cpp
fileapi/EntryArray.cpp
fileapi/EntryArraySync.cpp
platform/AsyncFileSystem.cpp
)
LIST(APPEND WebCore_IDL_FILES
+ Modules/filesystem/DOMWindowFileSystem.idl
Modules/filesystem/DirectoryEntry.idl
Modules/filesystem/DirectoryEntrySync.idl
Modules/filesystem/DirectoryReader.idl
Modules/filesystem/DirectoryReaderSync.idl
fileapi/DOMFileSystem.idl
fileapi/DOMFileSystemSync.idl
- fileapi/DOMWindowFileSystem.idl
Modules/filesystem/EntriesCallback.idl
fileapi/Entry.idl
fileapi/EntrySync.idl
+2012-03-16 Mark Pilgrim <pilgrim@chromium.org>
+
+ Move DOMWindowFileSystem to Modules/filesystem/
+ https://bugs.webkit.org/show_bug.cgi?id=81030
+
+ Reviewed by Adam Barth.
+
+ No new tests, all existing tests pass.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * Modules/filesystem/DOMWindowFileSystem.cpp: Copied from Source/WebCore/fileapi/DOMWindowFileSystem.cpp.
+ * Modules/filesystem/DOMWindowFileSystem.h: Copied from Source/WebCore/fileapi/DOMWindowFileSystem.h.
+ * Modules/filesystem/DOMWindowFileSystem.idl: Copied from Source/WebCore/fileapi/DOMWindowFileSystem.idl.
+ * Target.pri:
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcproj/WebCoreCommon.vsprops:
+ * WebCore.vcproj/copyForwardingHeaders.cmd:
+ * fileapi/DOMWindowFileSystem.cpp: Removed.
+ * fileapi/DOMWindowFileSystem.h: Removed.
+ * fileapi/DOMWindowFileSystem.idl: Removed.
+
2012-03-16 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r110951.
$(WebCore)/fileapi/Blob.idl \
$(WebCore)/fileapi/DOMFileSystem.idl \
$(WebCore)/fileapi/DOMFileSystemSync.idl \
- $(WebCore)/fileapi/DOMWindowFileSystem.idl \
+ $(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
$(WebCore)/Modules/filesystem/DirectoryEntry.idl \
$(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
$(WebCore)/Modules/filesystem/DirectoryReader.idl \
$$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/fileapi/DOMWindowFileSystem.idl \
$$PWD/Modules/filesystem/EntriesCallback.idl \
$$PWD/fileapi/Entry.idl \
$$PWD/fileapi/EntryArray.idl \
$(XT_CFLAGS)
EXTRA_DIST += \
+ $(shell ls $(srcdir)/Source/WebCore/Modules/filesystem/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/Modules/geolocation/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/Modules/indexeddb/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/Modules/mediastream/*.idl) \
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/fileapi/DOMFileSystemBase.h \
Source/WebCore/fileapi/DOMFileSystemSync.cpp \
Source/WebCore/fileapi/DOMFileSystemSync.h \
- Source/WebCore/fileapi/DOMWindowFileSystem.cpp \
- Source/WebCore/fileapi/DOMWindowFileSystem.h \
Source/WebCore/Modules/filesystem/EntriesCallback.h \
Source/WebCore/fileapi/Entry.cpp \
Source/WebCore/fileapi/Entry.h \
dom_binding_idls += \
$(WebCore)/fileapi/DOMFileSystem.idl \
$(WebCore)/fileapi/DOMFileSystemSync.idl \
- $(WebCore)/fileapi/DOMWindowFileSystem.idl \
+ $(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
$(WebCore)/Modules/filesystem/DirectoryEntry.idl \
$(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
$(WebCore)/Modules/filesystem/DirectoryReader.idl \
}
SOURCES += \
+ Modules/filesystem/DOMWindowFileSystem.cpp \
+ Modules/filesystem/DirectoryEntry.cpp \
+ Modules/filesystem/DirectoryEntrySync.cpp \
+ Modules/filesystem/DirectoryReader.cpp \
+ Modules/filesystem/DirectoryReaderSync.cpp \
css/CSSAspectRatioValue.cpp \
css/CSSBorderImageSliceValue.cpp \
css/CSSBorderImage.cpp \
fileapi/DOMFileSystem.cpp \
fileapi/DOMFileSystemBase.cpp \
fileapi/DOMFileSystemSync.cpp \
- fileapi/DOMWindowFileSystem.cpp \
- Modules/filesystem/DirectoryEntry.cpp \
- Modules/filesystem/DirectoryEntrySync.cpp \
- Modules/filesystem/DirectoryReader.cpp \
- Modules/filesystem/DirectoryReaderSync.cpp \
fileapi/Entry.cpp \
fileapi/EntryArray.cpp \
fileapi/EntryArraySync.cpp \
],
'variables': {
'generator_include_dirs': [
+ '--include', '../Modules/filesystem',
'--include', '../Modules/indexeddb',
'--include', '../Modules/mediastream',
'--include', '../Modules/webdatabase',
'svg/properties/SVGTransformListPropertyTearOff.h',
],
'webcore_bindings_idl_files': [
+ 'Modules/filesystem/DOMWindowFileSystem.idl',
+ 'Modules/filesystem/DirectoryEntry.idl',
+ 'Modules/filesystem/DirectoryEntrySync.idl',
+ 'Modules/filesystem/DirectoryReader.idl',
+ 'Modules/filesystem/DirectoryReaderSync.idl',
'Modules/gamepad/Gamepad.idl',
'Modules/gamepad/GamepadList.idl',
'Modules/gamepad/NavigatorGamepad.idl',
'Modules/filesystem/DirectoryReaderSync.idl',
'fileapi/DOMFileSystem.idl',
'fileapi/DOMFileSystemSync.idl',
- 'fileapi/DOMWindowFileSystem.idl',
'Modules/filesystem/EntriesCallback.idl',
'fileapi/Entry.idl',
'fileapi/EntryArray.idl',
'svg/SVGZoomEvent.idl',
],
'webcore_files': [
+ 'Modules/filesystem/DOMWindowFileSystem.cpp',
+ 'Modules/filesystem/DOMWindowFileSystem.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/gamepad/Gamepad.cpp',
'Modules/gamepad/Gamepad.h',
'Modules/gamepad/GamepadList.cpp',
'fileapi/DOMFileSystemBase.h',
'fileapi/DOMFileSystemSync.cpp',
'fileapi/DOMFileSystemSync.h',
- 'fileapi/DOMWindowFileSystem.cpp',
- 'fileapi/DOMWindowFileSystem.h',
'Modules/filesystem/DirectoryEntry.cpp',
'Modules/filesystem/DirectoryEntry.h',
'Modules/filesystem/DirectoryEntrySync.cpp',
RelativePath="..\Modules\filesystem\EntriesCallback.h"
>
</File>
+ <File
+ RelativePath="..\Modules\filesystem\DOMWindowFileSystem.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Modules\filesystem\DOMWindowFileSystem.h"
+ >
+ </File>
</Filter>
<Filter
Name="geolocation"
<Filter
Name="fileapi"
>
- <File
- RelativePath="..\fileapi\DOMWindowFileSystem.cpp"
- >
- </File>
- <File
- RelativePath="..\fileapi\DOMWindowFileSystem.h"
- >
- </File>
<File
RelativePath="..\fileapi\EntryBase.cpp"
>
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)..";"$(ProjectDir)..\Modules\geolocation";"$(ProjectDir)..\Modules\indexeddb";"$(ProjectDir)..\Modules\webdatabase";"$(ProjectDir)..\Modules\websockets";"$(ProjectDir)..\accessibility";"$(ProjectDir)..\accessibility\win";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\bridge\jsc";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\fileapi";"$(ProjectDir)..\rendering";"$(ProjectDir)..\rendering\mathml";"$(ProjectDir)..\rendering\style";"$(ProjectDir)..\rendering\svg";"$(ProjectDir)..\bindings";"$(ProjectDir)..\bindings\generic";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\bindings\js\specialization";"$(ProjectDir)..\dom";"$(ProjectDir)..\dom\default";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\html\canvas";"$(ProjectDir)..\html\parser";"$(ProjectDir)..\html\shadow";"$(ProjectDir)..\inspector";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\appcache";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\cache";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\mathml";"$(ProjectDir)..\notifications";"$(ProjectDir)..\page";"$(ProjectDir)..\page\animation";"$(ProjectDir)..\page\scrolling";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\animation";"$(ProjectDir)..\platform\mock";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\graphics\ca";"$(ProjectDir)..\platform\graphics\filters";"$(ProjectDir)..\platform\graphics\filters\arm";"$(ProjectDir)..\platform\graphics\opentype";"$(ProjectDir)..\platform\graphics\transforms";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\text\transcoder";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\xml";"$(ProjectDir)..\xml\parser";"$(ConfigurationBuildDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\svg\animation";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\properties";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\svg";"$(ProjectDir)..\testing";"$(ProjectDir)..\wml";"$(ProjectDir)..\storage";"$(ProjectDir)..\websockets";"$(ProjectDir)..\workers";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(WebKitLibrariesDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\zlib""
+ AdditionalIncludeDirectories=""$(ProjectDir)..";"$(ProjectDir)..\Modules\filesystem";"$(ProjectDir)..\Modules\geolocation";"$(ProjectDir)..\Modules\indexeddb";"$(ProjectDir)..\Modules\webdatabase";"$(ProjectDir)..\Modules\websockets";"$(ProjectDir)..\accessibility";"$(ProjectDir)..\accessibility\win";"$(ProjectDir)..\bridge";"$(ProjectDir)..\bridge\c";"$(ProjectDir)..\bridge\jsc";"$(ProjectDir)..\css";"$(ProjectDir)..\editing";"$(ProjectDir)..\fileapi";"$(ProjectDir)..\rendering";"$(ProjectDir)..\rendering\mathml";"$(ProjectDir)..\rendering\style";"$(ProjectDir)..\rendering\svg";"$(ProjectDir)..\bindings";"$(ProjectDir)..\bindings\generic";"$(ProjectDir)..\bindings\js";"$(ProjectDir)..\bindings\js\specialization";"$(ProjectDir)..\dom";"$(ProjectDir)..\dom\default";"$(ProjectDir)..\history";"$(ProjectDir)..\html";"$(ProjectDir)..\html\canvas";"$(ProjectDir)..\html\parser";"$(ProjectDir)..\html\shadow";"$(ProjectDir)..\inspector";"$(ProjectDir)..\loader";"$(ProjectDir)..\loader\appcache";"$(ProjectDir)..\loader\archive";"$(ProjectDir)..\loader\archive\cf";"$(ProjectDir)..\loader\cache";"$(ProjectDir)..\loader\icon";"$(ProjectDir)..\mathml";"$(ProjectDir)..\notifications";"$(ProjectDir)..\page";"$(ProjectDir)..\page\animation";"$(ProjectDir)..\page\scrolling";"$(ProjectDir)..\page\win";"$(ProjectDir)..\platform";"$(ProjectDir)..\platform\animation";"$(ProjectDir)..\platform\mock";"$(ProjectDir)..\platform\sql";"$(ProjectDir)..\platform\win";"$(ProjectDir)..\platform\network";"$(ProjectDir)..\platform\network\win";"$(ProjectDir)..\platform\cf";"$(ProjectDir)..\platform\graphics";"$(ProjectDir)..\platform\graphics\ca";"$(ProjectDir)..\platform\graphics\filters";"$(ProjectDir)..\platform\graphics\filters\arm";"$(ProjectDir)..\platform\graphics\opentype";"$(ProjectDir)..\platform\graphics\transforms";"$(ProjectDir)..\platform\text";"$(ProjectDir)..\platform\text\transcoder";"$(ProjectDir)..\platform\graphics\win";"$(ProjectDir)..\xml";"$(ProjectDir)..\xml\parser";"$(ConfigurationBuildDir)\obj\WebCore\DerivedSources";"$(ProjectDir)..\plugins";"$(ProjectDir)..\plugins\win";"$(ProjectDir)..\svg\animation";"$(ProjectDir)..\svg\graphics";"$(ProjectDir)..\svg\properties";"$(ProjectDir)..\svg\graphics\filters";"$(ProjectDir)..\svg";"$(ProjectDir)..\testing";"$(ProjectDir)..\wml";"$(ProjectDir)..\storage";"$(ProjectDir)..\websockets";"$(ProjectDir)..\workers";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private\JavaScriptCore";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(WebKitLibrariesDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\include\sqlite";"$(WebKitLibrariesDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\zlib""
PreprocessorDefinitions="__WIN32__;DISABLE_3D_RENDERING;WEBCORE_CONTEXT_MENUS"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="WebCorePrefix.h"
xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%ProjectDir%..\Modules\filesystem\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\webdatabase\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\Modules\websockets\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"