Commit 153233a2 authored by kinuko@chromium.org's avatar kinuko@chromium.org

2010-08-16 Kinuko Yasuda <kinuko@chromium.org>

        Reviewed by Dumitru Daniliuc.

        Add idl and mock classes for FileSystem API's {File,Directory}Entry and related interfaces
        https://bugs.webkit.org/show_bug.cgi?id=43993

        Adding DirectoryEntry, DirectoryReader, EntriesCallback and FileEntry as defined in HTML5 FileSystem API.
        http://dev.w3.org/2009/dap/file-system/file-dir-sys.html

        Also adding Makefile entries for idl and mock classes added in changeset 64414 (except for Android platforms).

        Tests will be added when we add underlying implementation.

        * CMakeLists.txt:
        * DerivedSources.cpp:
        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pri:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * storage/DOMFileSystem.cpp:
        (WebCore::DOMFileSystem::root):
        * storage/DOMFileSystem.h:
        * storage/DOMFileSystem.idl:
        * storage/DirectoryEntry.cpp: Added.
        * storage/DirectoryEntry.h: Added.
        * storage/DirectoryEntry.idl: Added.
        * storage/DirectoryReader.cpp: Added.
        * storage/DirectoryReader.h: Added.
        * storage/DirectoryReader.idl: Added.
        * storage/EntriesCallback.h: Added.
        * storage/EntriesCallback.idl: Added.
        * storage/EntryArray.cpp: Added.
        * storage/EntryArray.h: Added.
        * storage/EntryArray.idl: Added.
        * storage/Entry.cpp:
        (WebCore::Entry::Entry):
        (WebCore::Entry::getMetadata):
        (WebCore::Entry::moveTo):
        (WebCore::Entry::copyTo):
        (WebCore::Entry::remove):
        (WebCore::Entry::getParent):
        * storage/Entry.h:
        (WebCore::Entry::isFile):
        (WebCore::Entry::isDirectory):
        * storage/Entry.idl:
        * storage/FileEntry.cpp: Added.
        * storage/FileEntry.h: Added.
        * storage/FileEntry.idl: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65474 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 91572f0b
......@@ -334,6 +334,17 @@ SET(WebCore_IDL_FILES
storage/Database.idl
storage/DatabaseCallback.idl
storage/DatabaseSync.idl
storage/DirectoryEntry.idl
storage/DirectoryReader.idl
storage/DOMFileSystem.idl
storage/EntriesCallback.idl
storage/Entry.idl
storage/EntryArray.idl
storage/EntryCallback.idl
storage/ErrorCallback.idl
storage/FileEntry.idl
storage/FileSystemCallback.idl
storage/Flags.idl
storage/IDBAny.idl
storage/IDBCursor.idl
storage/IDBDatabaseError.idl
......@@ -349,6 +360,8 @@ SET(WebCore_IDL_FILES
storage/IDBRequest.idl
storage/IDBSuccessEvent.idl
storage/IDBTransaction.idl
storage/Metadata.idl
storage/MetadataCallback.idl
storage/SQLError.idl
storage/SQLException.idl
storage/SQLResultSet.idl
......@@ -1439,6 +1452,12 @@ SET(WebCore_SOURCES
storage/DatabaseTask.cpp
storage/DatabaseThread.cpp
storage/DatabaseTracker.cpp
storage/DirectoryEntry.cpp
storage/DirectoryReader.cpp
storage/DOMFileSystem.cpp
storage/Entry.cpp
storage/EntryArray.cpp
storage/FileEntry.cpp
storage/IDBAny.cpp
storage/IDBDatabase.cpp
storage/IDBDatabaseBackendImpl.cpp
......
2010-08-16 Kinuko Yasuda <kinuko@chromium.org>
Reviewed by Dumitru Daniliuc.
Add idl and mock classes for FileSystem API's {File,Directory}Entry and related interfaces
https://bugs.webkit.org/show_bug.cgi?id=43993
Adding DirectoryEntry, DirectoryReader, EntriesCallback and FileEntry as defined in HTML5 FileSystem API.
http://dev.w3.org/2009/dap/file-system/file-dir-sys.html
Also adding Makefile entries for idl and mock classes added in changeset 64414 (except for Android platforms).
Tests will be added when we add underlying implementation.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pri:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* storage/DOMFileSystem.cpp:
(WebCore::DOMFileSystem::root):
* storage/DOMFileSystem.h:
* storage/DOMFileSystem.idl:
* storage/DirectoryEntry.cpp: Added.
* storage/DirectoryEntry.h: Added.
* storage/DirectoryEntry.idl: Added.
* storage/DirectoryReader.cpp: Added.
* storage/DirectoryReader.h: Added.
* storage/DirectoryReader.idl: Added.
* storage/EntriesCallback.h: Added.
* storage/EntriesCallback.idl: Added.
* storage/EntryArray.cpp: Added.
* storage/EntryArray.h: Added.
* storage/EntryArray.idl: Added.
* storage/Entry.cpp:
(WebCore::Entry::Entry):
(WebCore::Entry::getMetadata):
(WebCore::Entry::moveTo):
(WebCore::Entry::copyTo):
(WebCore::Entry::remove):
(WebCore::Entry::getParent):
* storage/Entry.h:
(WebCore::Entry::isFile):
(WebCore::Entry::isDirectory):
* storage/Entry.idl:
* storage/FileEntry.cpp: Added.
* storage/FileEntry.h: Added.
* storage/FileEntry.idl: Added.
2010-08-16 Andreas Kling <andreas.kling@nokia.com>
Reviewed by Ariya Hidayat.
......@@ -73,11 +73,14 @@
#include "JSDataGridColumnList.cpp"
#include "JSDedicatedWorkerContext.cpp"
#include "JSDeviceOrientationEvent.cpp"
#include "JSDirectoryEntry.cpp"
#include "JSDirectoryReader.cpp"
#include "JSDocument.cpp"
#include "JSDocumentFragment.cpp"
#include "JSDocumentType.cpp"
#include "JSDOMApplicationCache.cpp"
#include "JSDOMCoreException.cpp"
#include "JSDOMFileSystem.cpp"
#include "JSDOMFormData.cpp"
#include "JSDOMImplementation.cpp"
#include "JSDOMMimeType.cpp"
......@@ -92,14 +95,22 @@
#include "JSElement.cpp"
#include "JSEntity.cpp"
#include "JSEntityReference.cpp"
#include "JSEntriesCallback.cpp"
#include "JSEntry.cpp"
#include "JSEntryArray.cpp"
#include "JSEntryCallback.cpp"
#include "JSErrorCallback.cpp"
#include "JSErrorEvent.cpp"
#include "JSEvent.cpp"
#include "JSEventException.cpp"
#include "JSEventSource.cpp"
#include "JSFile.cpp"
#include "JSFileEntry.cpp"
#include "JSFileError.cpp"
#include "JSFileList.cpp"
#include "JSFileReader.cpp"
#include "JSFileSystemCallback.cpp"
#include "JSFlags.cpp"
#include "JSGeolocation.cpp"
#include "JSGeoposition.cpp"
#include "JSHistory.cpp"
......@@ -203,6 +214,8 @@
#include "JSMessageChannel.cpp"
#include "JSMessageEvent.cpp"
#include "JSMessagePort.cpp"
#include "JSMetadata.cpp"
#include "JSMetadataCallback.cpp"
#include "JSMouseEvent.cpp"
#include "JSMutationEvent.cpp"
#include "JSNamedNodeMap.cpp"
......
......@@ -129,6 +129,8 @@ DOM_CLASSES = \
DatabaseSync \
DeviceMotionEvent \
DeviceOrientationEvent \
DirectoryEntry \
DirectoryReader \
Document \
DocumentFragment \
DocumentType \
......@@ -136,7 +138,9 @@ DOM_CLASSES = \
ElementTimeControl \
Entity \
EntityReference \
EntriesCallback \
Entry \
EntryArray \
EntryCallback \
ErrorCallback \
ErrorEvent \
......@@ -146,6 +150,7 @@ DOM_CLASSES = \
EventSource \
EventTarget \
File \
FileEntry \
FileError \
FileList \
FileReader \
......
......@@ -2993,6 +2993,55 @@ FEATURE_DEFINES += ENABLE_FILE_SYSTEM=1
webcore_cppflags += -DENABLE_FILE_SYSTEM=1
endif # END ENABLE_FILE_SYSTEM
webcore_built_sources += \
DerivedSources/WebCore/JSDirectoryEntry.cpp \
DerivedSources/WebCore/JSDirectoryEntry.h \
DerivedSources/WebCore/JSDirectoryReader.cpp \
DerivedSources/WebCore/JSDirectoryReader.h \
DerivedSources/WebCore/JSDOMFileSystem.cpp \
DerivedSources/WebCore/JSDOMFileSystem.h \
DerivedSources/WebCore/JSEntriesCallback.cpp \
DerivedSources/WebCore/JSEntriesCallback.h \
DerivedSources/WebCore/JSEntry.cpp \
DerivedSources/WebCore/JSEntry.h \
DerivedSources/WebCore/JSEntryArray.cpp \
DerivedSources/WebCore/JSEntryArray.h \
DerivedSources/WebCore/JSEntryCallback.cpp \
DerivedSources/WebCore/JSEntryCallback.h \
DerivedSources/WebCore/JSErrorCallback.cpp \
DerivedSources/WebCore/JSErrorCallback.h \
DerivedSources/WebCore/JSFileEntry.cpp \
DerivedSources/WebCore/JSFileEntry.h \
DerivedSources/WebCore/JSFileSystemCallback.cpp \
DerivedSources/WebCore/JSFileSystemCallback.h \
DerivedSources/WebCore/JSFlags.cpp \
DerivedSources/WebCore/JSFlags.h \
DerivedSources/WebCore/JSMetadata.cpp \
DerivedSources/WebCore/JSMetadata.h \
DerivedSources/WebCore/JSMetadataCallback.cpp \
DerivedSources/WebCore/JSMetadataCallback.h
webcore_sources += \
WebCore/storage/DirectoryEntry.cpp \
WebCore/storage/DirectoryEntry.h \
WebCore/storage/DirectoryReader.cpp \
WebCore/storage/DirectoryReader.h \
WebCore/storage/DOMFileSystem.cpp \
WebCore/storage/DOMFileSystem.h \
WebCore/storage/EntriesCallback.h \
WebCore/storage/Entry.cpp \
WebCore/storage/Entry.h \
WebCore/storage/EntryArray.cpp \
WebCore/storage/EntryArray.h \
WebCore/storage/EntryCallback.h \
WebCore/storage/ErrorCallback.h \
WebCore/storage/FileEntry.cpp \
WebCore/storage/FileEntry.h \
WebCore/storage/FileSystemCallback.h \
WebCore/storage/Flags.h \
WebCore/storage/Metadata.h \
WebCore/storage/MetadataCallback.h
# ----
# Speech Input API support
# ----
......
......@@ -231,10 +231,15 @@
'storage/Database.idl',
'storage/DatabaseCallback.idl',
'storage/DatabaseSync.idl',
'storage/DirectoryEntry.idl',
'storage/DirectoryReader.idl',
'storage/DOMFileSystem.idl',
'storage/EntriesCallback.idl',
'storage/Entry.idl',
'storage/EntryArray.idl',
'storage/EntryCallback.idl',
'storage/ErrorCallback.idl',
'storage/FileEntry.idl',
'storage/FileSystemCallback.idl',
'storage/Flags.idl',
'storage/IDBAny.idl',
......@@ -3539,11 +3544,21 @@
'storage/DatabaseTracker.cpp',
'storage/DatabaseTracker.h',
'storage/DatabaseTrackerClient.h',
'storage/DirectoryEntry.cpp',
'storage/DirectoryEntry.h',
'storage/DirectoryReader.cpp',
'storage/DirectoryReader.h',
'storage/DOMFileSystem.cpp',
'storage/DOMFileSystem.h',
'storage/EntriesCallback.h',
'storage/Entry.cpp',
'storage/Entry.h',
'storage/EntryArray.cpp',
'storage/EntryArray.h',
'storage/EntryCallback.h',
'storage/ErrorCallback.h',
'storage/FileEntry.cpp',
'storage/FileEntry.h',
'storage/FileSystemCallback.h',
'storage/Flags.h',
'storage/IDBAny.cpp',
......
......@@ -291,6 +291,17 @@ IDL_BINDINGS += \
storage/Database.idl \
storage/DatabaseCallback.idl \
storage/DatabaseSync.idl \
storage/DirectoryEntry.idl \
storage/DirectoryReader.idl \
storage/DOMFileSystem.idl \
storage/EntriesCallback.idl \
storage/Entry.idl \
storage/EntryArray.idl \
storage/EntryCallback.idl \
storage/ErrorCallback.idl \
storage/FileEntry.idl \
storage/FileSystemCallback.idl \
storage/Flags.idl \
storage/IDBAny.idl \
storage/IDBCursor.idl \
storage/IDBDatabaseError.idl \
......@@ -306,6 +317,8 @@ IDL_BINDINGS += \
storage/IDBRequest.idl \
storage/IDBSuccessEvent.idl \
storage/IDBTransaction.idl \
storage/Metadata.idl \
storage/MetadataCallback.idl \
storage/Storage.idl \
storage/StorageEvent.idl \
storage/SQLError.idl \
......
......@@ -2546,6 +2546,31 @@ contains(DEFINES, ENABLE_DOM_STORAGE=1) {
storage/StorageSyncManager.cpp
}
contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
HEADERS += \
storage/DirectoryEntry.h \
storage/DirectoryReader.h \
storage/DOMFileSystem.h \
storage/EntriesCallback.h \
storage/Entry.h \
storage/EntryArray.h \
storage/EntryCallback.h \
storage/ErrorCallback.h \
storage/FileEntry.h \
storage/FileSystemCallback.h \
storage/Flags.h \
storage/Metadata.h \
storage/MetadataCallback.h
SOURCES += \
storage/DirectoryEntry.cpp \
storage/DirectoryReader.cpp \
storage/DOMFileSystem.cpp \
storage/Entry.cpp \
storage/EntryArray.cpp \
storage/FileEntry.cpp
}
contains(DEFINES, ENABLE_ICONDATABASE=1) {
SOURCES += \
loader/icon/IconDatabase.cpp \
......
This diff is collapsed.
......@@ -2380,6 +2380,45 @@
895253DF116C4F0600CABF00 /* FileThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 895253DE116C4F0600CABF00 /* FileThreadTask.h */; };
8988E10E11A3508B00DB732E /* BlobItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8988E10C11A3508B00DB732E /* BlobItem.cpp */; };
8988E10F11A3508B00DB732E /* BlobItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 8988E10D11A3508B00DB732E /* BlobItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
899ABC261215E4A300F9F219 /* DirectoryEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC201215E4A300F9F219 /* DirectoryEntry.cpp */; };
899ABC271215E4A300F9F219 /* DirectoryEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC211215E4A300F9F219 /* DirectoryEntry.h */; };
899ABC291215E4A300F9F219 /* DirectoryReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC231215E4A300F9F219 /* DirectoryReader.cpp */; };
899ABC2A1215E4A300F9F219 /* DirectoryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC241215E4A300F9F219 /* DirectoryReader.h */; };
899ABC341215E4BE00F9F219 /* EntriesCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC2C1215E4BE00F9F219 /* EntriesCallback.h */; };
899ABC361215E4BE00F9F219 /* EntryArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC2E1215E4BE00F9F219 /* EntryArray.cpp */; };
899ABC371215E4BE00F9F219 /* EntryArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC2F1215E4BE00F9F219 /* EntryArray.h */; };
899ABC391215E4BE00F9F219 /* FileEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC311215E4BE00F9F219 /* FileEntry.cpp */; };
899ABC3A1215E4BE00F9F219 /* FileEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC321215E4BE00F9F219 /* FileEntry.h */; };
899ABC5D1215EB2A00F9F219 /* JSDirectoryEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC551215EB2A00F9F219 /* JSDirectoryEntry.cpp */; };
899ABC5E1215EB2A00F9F219 /* JSDirectoryEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC561215EB2A00F9F219 /* JSDirectoryEntry.h */; };
899ABC5F1215EB2A00F9F219 /* JSEntriesCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC571215EB2A00F9F219 /* JSEntriesCallback.cpp */; };
899ABC601215EB2A00F9F219 /* JSEntriesCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC581215EB2A00F9F219 /* JSEntriesCallback.h */; };
899ABC611215EB2A00F9F219 /* JSEntryArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC591215EB2A00F9F219 /* JSEntryArray.cpp */; };
899ABC621215EB2A00F9F219 /* JSEntryArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC5A1215EB2A00F9F219 /* JSEntryArray.h */; };
899ABC631215EB2A00F9F219 /* JSFileEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC5B1215EB2A00F9F219 /* JSFileEntry.cpp */; };
899ABC641215EB2A00F9F219 /* JSFileEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC5C1215EB2A00F9F219 /* JSFileEntry.h */; };
899ABC6D1215ECEF00F9F219 /* JSDirectoryReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 899ABC6B1215ECEF00F9F219 /* JSDirectoryReader.cpp */; };
899ABC6E1215ECEF00F9F219 /* JSDirectoryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 899ABC6C1215ECEF00F9F219 /* JSDirectoryReader.h */; };
899ABC791215F03100F9F219 /* JSDOMFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D8D1200035F0082740C /* JSDOMFileSystem.cpp */; };
899ABC7A1215F03100F9F219 /* JSDOMFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D8E1200035F0082740C /* JSDOMFileSystem.h */; };
899ABC7B1215F03300F9F219 /* JSEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D4911FF6C900082740C /* JSEntry.cpp */; };
899ABC7C1215F03300F9F219 /* JSEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D4A11FF6C900082740C /* JSEntry.h */; };
899ABC7D1215F03600F9F219 /* JSEntryCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D4B11FF6C900082740C /* JSEntryCallback.cpp */; };
899ABC7E1215F03700F9F219 /* JSEntryCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D4C11FF6C900082740C /* JSEntryCallback.h */; };
899ABC7F1215F03800F9F219 /* JSErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D4D11FF6C900082740C /* JSErrorCallback.cpp */; };
899ABC801215F03800F9F219 /* JSErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D4E11FF6C900082740C /* JSErrorCallback.h */; };
899ABC811215F03B00F9F219 /* JSFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D92120003760082740C /* JSFlags.h */; };
899ABC821215F03B00F9F219 /* JSFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D91120003760082740C /* JSFlags.cpp */; };
899ABC831215F03C00F9F219 /* JSFileSystemCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D5611FF6CA40082740C /* JSFileSystemCallback.h */; };
899ABC841215F03D00F9F219 /* JSFileSystemCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D5511FF6CA40082740C /* JSFileSystemCallback.cpp */; };
899ABC861215F0D800F9F219 /* DOMFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D1911FF58A50082740C /* DOMFileSystem.cpp */; };
899ABC871215F0DF00F9F219 /* DOMFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D1A11FF58A50082740C /* DOMFileSystem.h */; };
899ABC961215F9DA00F9F219 /* ErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D2011FF58A50082740C /* ErrorCallback.h */; };
899ABC971215F9DF00F9F219 /* EntryCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D1E11FF58A50082740C /* EntryCallback.h */; };
899ABCAA1215FA5500F9F219 /* FileSystemCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D2111FF58A50082740C /* FileSystemCallback.h */; };
899ABCAB1215FA5A00F9F219 /* Flags.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D60120001220082740C /* Flags.h */; };
899ABCB91215FAB500F9F219 /* Entry.h in Headers */ = {isa = PBXBuildFile; fileRef = 897A2D1D11FF58A50082740C /* Entry.h */; };
899ABCBA1215FAB800F9F219 /* Entry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 897A2D1C11FF58A50082740C /* Entry.cpp */; };
89B5EAA111E8003D00F2367E /* LineEnding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89B5EA9F11E8003D00F2367E /* LineEnding.cpp */; };
89B5EAA211E8003D00F2367E /* LineEnding.h in Headers */ = {isa = PBXBuildFile; fileRef = 89B5EAA011E8003D00F2367E /* LineEnding.h */; settings = {ATTRIBUTES = (Private, ); }; };
89BED5EB11BE11CE00448492 /* BlobBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89BED5E911BE11CE00448492 /* BlobBuilder.cpp */; };
......@@ -8214,6 +8253,30 @@
897A2D92120003760082740C /* JSFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFlags.h; sourceTree = "<group>"; };
8988E10C11A3508B00DB732E /* BlobItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobItem.cpp; sourceTree = "<group>"; };
8988E10D11A3508B00DB732E /* BlobItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobItem.h; sourceTree = "<group>"; };
899ABC201215E4A300F9F219 /* DirectoryEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryEntry.cpp; sourceTree = "<group>"; };
899ABC211215E4A300F9F219 /* DirectoryEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryEntry.h; sourceTree = "<group>"; };
899ABC221215E4A300F9F219 /* DirectoryEntry.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DirectoryEntry.idl; sourceTree = "<group>"; };
899ABC231215E4A300F9F219 /* DirectoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryReader.cpp; sourceTree = "<group>"; };
899ABC241215E4A300F9F219 /* DirectoryReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryReader.h; sourceTree = "<group>"; };
899ABC251215E4A300F9F219 /* DirectoryReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DirectoryReader.idl; sourceTree = "<group>"; };
899ABC2C1215E4BE00F9F219 /* EntriesCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EntriesCallback.h; sourceTree = "<group>"; };
899ABC2D1215E4BE00F9F219 /* EntriesCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EntriesCallback.idl; sourceTree = "<group>"; };
899ABC2E1215E4BE00F9F219 /* EntryArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EntryArray.cpp; sourceTree = "<group>"; };
899ABC2F1215E4BE00F9F219 /* EntryArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EntryArray.h; sourceTree = "<group>"; };
899ABC301215E4BE00F9F219 /* EntryArray.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EntryArray.idl; sourceTree = "<group>"; };
899ABC311215E4BE00F9F219 /* FileEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileEntry.cpp; sourceTree = "<group>"; };
899ABC321215E4BE00F9F219 /* FileEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileEntry.h; sourceTree = "<group>"; };
899ABC331215E4BE00F9F219 /* FileEntry.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FileEntry.idl; sourceTree = "<group>"; };
899ABC551215EB2A00F9F219 /* JSDirectoryEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDirectoryEntry.cpp; sourceTree = "<group>"; };
899ABC561215EB2A00F9F219 /* JSDirectoryEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDirectoryEntry.h; sourceTree = "<group>"; };
899ABC571215EB2A00F9F219 /* JSEntriesCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEntriesCallback.cpp; sourceTree = "<group>"; };
899ABC581215EB2A00F9F219 /* JSEntriesCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEntriesCallback.h; sourceTree = "<group>"; };
899ABC591215EB2A00F9F219 /* JSEntryArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEntryArray.cpp; sourceTree = "<group>"; };
899ABC5A1215EB2A00F9F219 /* JSEntryArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEntryArray.h; sourceTree = "<group>"; };
899ABC5B1215EB2A00F9F219 /* JSFileEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileEntry.cpp; sourceTree = "<group>"; };
899ABC5C1215EB2A00F9F219 /* JSFileEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileEntry.h; sourceTree = "<group>"; };
899ABC6B1215ECEF00F9F219 /* JSDirectoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDirectoryReader.cpp; sourceTree = "<group>"; };
899ABC6C1215ECEF00F9F219 /* JSDirectoryReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDirectoryReader.h; sourceTree = "<group>"; };
89B5EA9F11E8003D00F2367E /* LineEnding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LineEnding.cpp; sourceTree = "<group>"; };
89B5EAA011E8003D00F2367E /* LineEnding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineEnding.h; sourceTree = "<group>"; };
89BED5E911BE11CE00448492 /* BlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobBuilder.cpp; sourceTree = "<group>"; };
......@@ -11490,16 +11553,30 @@
1AD51A130CB59CD300953D11 /* DatabaseTracker.cpp */,
1AD51A120CB59CD300953D11 /* DatabaseTracker.h */,
51FAFE330CECBF2D00BB3F24 /* DatabaseTrackerClient.h */,
899ABC201215E4A300F9F219 /* DirectoryEntry.cpp */,
899ABC211215E4A300F9F219 /* DirectoryEntry.h */,
899ABC221215E4A300F9F219 /* DirectoryEntry.idl */,
899ABC231215E4A300F9F219 /* DirectoryReader.cpp */,
899ABC241215E4A300F9F219 /* DirectoryReader.h */,
899ABC251215E4A300F9F219 /* DirectoryReader.idl */,
897A2D1911FF58A50082740C /* DOMFileSystem.cpp */,
897A2D1A11FF58A50082740C /* DOMFileSystem.h */,
897A2D1B11FF58A50082740C /* DOMFileSystem.idl */,
899ABC2C1215E4BE00F9F219 /* EntriesCallback.h */,
899ABC2D1215E4BE00F9F219 /* EntriesCallback.idl */,
897A2D1C11FF58A50082740C /* Entry.cpp */,
897A2D1D11FF58A50082740C /* Entry.h */,
897A2D3B11FF63860082740C /* Entry.idl */,
899ABC2E1215E4BE00F9F219 /* EntryArray.cpp */,
899ABC2F1215E4BE00F9F219 /* EntryArray.h */,
899ABC301215E4BE00F9F219 /* EntryArray.idl */,
897A2D1E11FF58A50082740C /* EntryCallback.h */,
897A2D1F11FF58A50082740C /* EntryCallback.idl */,
897A2D2011FF58A50082740C /* ErrorCallback.h */,
897A2D5D120000FF0082740C /* ErrorCallback.idl */,
899ABC311215E4BE00F9F219 /* FileEntry.cpp */,
899ABC321215E4BE00F9F219 /* FileEntry.h */,
899ABC331215E4BE00F9F219 /* FileEntry.idl */,
897A2D2111FF58A50082740C /* FileSystemCallback.h */,
897A2D5F120001220082740C /* FileSystemCallback.idl */,
897A2D60120001220082740C /* Flags.h */,
......@@ -14980,14 +15057,24 @@
B59DD697119029E5007E9684 /* JSDatabaseCallback.h */,
B58CEB6811913607002A6790 /* JSDatabaseSync.cpp */,
B58CEB6711913607002A6790 /* JSDatabaseSync.h */,
899ABC551215EB2A00F9F219 /* JSDirectoryEntry.cpp */,
899ABC561215EB2A00F9F219 /* JSDirectoryEntry.h */,
899ABC6B1215ECEF00F9F219 /* JSDirectoryReader.cpp */,
899ABC6C1215ECEF00F9F219 /* JSDirectoryReader.h */,
897A2D8D1200035F0082740C /* JSDOMFileSystem.cpp */,
897A2D8E1200035F0082740C /* JSDOMFileSystem.h */,
899ABC571215EB2A00F9F219 /* JSEntriesCallback.cpp */,
899ABC581215EB2A00F9F219 /* JSEntriesCallback.h */,
897A2D4911FF6C900082740C /* JSEntry.cpp */,
897A2D4A11FF6C900082740C /* JSEntry.h */,
899ABC591215EB2A00F9F219 /* JSEntryArray.cpp */,
899ABC5A1215EB2A00F9F219 /* JSEntryArray.h */,
897A2D4B11FF6C900082740C /* JSEntryCallback.cpp */,
897A2D4C11FF6C900082740C /* JSEntryCallback.h */,
897A2D4D11FF6C900082740C /* JSErrorCallback.cpp */,
897A2D4E11FF6C900082740C /* JSErrorCallback.h */,
899ABC5B1215EB2A00F9F219 /* JSFileEntry.cpp */,
899ABC5C1215EB2A00F9F219 /* JSFileEntry.h */,
897A2D5511FF6CA40082740C /* JSFileSystemCallback.cpp */,
897A2D5611FF6CA40082740C /* JSFileSystemCallback.h */,
897A2D91120003760082740C /* JSFlags.cpp */,
......@@ -20193,6 +20280,28 @@
C50B561712119D23008B46E0 /* GroupSettings.h in Headers */,
BCA979171215D055005C485C /* ImageBufferData.h in Headers */,
490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */,
899ABC271215E4A300F9F219 /* DirectoryEntry.h in Headers */,
899ABC2A1215E4A300F9F219 /* DirectoryReader.h in Headers */,
899ABC341215E4BE00F9F219 /* EntriesCallback.h in Headers */,
899ABC371215E4BE00F9F219 /* EntryArray.h in Headers */,
899ABC3A1215E4BE00F9F219 /* FileEntry.h in Headers */,
899ABC5E1215EB2A00F9F219 /* JSDirectoryEntry.h in Headers */,
899ABC601215EB2A00F9F219 /* JSEntriesCallback.h in Headers */,
899ABC621215EB2A00F9F219 /* JSEntryArray.h in Headers */,
899ABC641215EB2A00F9F219 /* JSFileEntry.h in Headers */,
899ABC6E1215ECEF00F9F219 /* JSDirectoryReader.h in Headers */,
899ABC7A1215F03100F9F219 /* JSDOMFileSystem.h in Headers */,
899ABC7C1215F03300F9F219 /* JSEntry.h in Headers */,
899ABC7E1215F03700F9F219 /* JSEntryCallback.h in Headers */,
899ABC801215F03800F9F219 /* JSErrorCallback.h in Headers */,
899ABC811215F03B00F9F219 /* JSFlags.h in Headers */,
899ABC831215F03C00F9F219 /* JSFileSystemCallback.h in Headers */,
899ABC871215F0DF00F9F219 /* DOMFileSystem.h in Headers */,
899ABC961215F9DA00F9F219 /* ErrorCallback.h in Headers */,
899ABC971215F9DF00F9F219 /* EntryCallback.h in Headers */,
899ABCAA1215FA5500F9F219 /* FileSystemCallback.h in Headers */,
899ABCAB1215FA5A00F9F219 /* Flags.h in Headers */,
899ABCB91215FAB500F9F219 /* Entry.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -22625,6 +22734,23 @@
97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */,
490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */,
899ABC261215E4A300F9F219 /* DirectoryEntry.cpp in Sources */,
899ABC291215E4A300F9F219 /* DirectoryReader.cpp in Sources */,
899ABC361215E4BE00F9F219 /* EntryArray.cpp in Sources */,
899ABC391215E4BE00F9F219 /* FileEntry.cpp in Sources */,
899ABC5D1215EB2A00F9F219 /* JSDirectoryEntry.cpp in Sources */,
899ABC5F1215EB2A00F9F219 /* JSEntriesCallback.cpp in Sources */,
899ABC611215EB2A00F9F219 /* JSEntryArray.cpp in Sources */,
899ABC631215EB2A00F9F219 /* JSFileEntry.cpp in Sources */,
899ABC6D1215ECEF00F9F219 /* JSDirectoryReader.cpp in Sources */,
899ABC791215F03100F9F219 /* JSDOMFileSystem.cpp in Sources */,
899ABC7B1215F03300F9F219 /* JSEntry.cpp in Sources */,
899ABC7D1215F03600F9F219 /* JSEntryCallback.cpp in Sources */,
899ABC7F1215F03800F9F219 /* JSErrorCallback.cpp in Sources */,
899ABC821215F03B00F9F219 /* JSFlags.cpp in Sources */,
899ABC841215F03D00F9F219 /* JSFileSystemCallback.cpp in Sources */,
899ABC861215F0D800F9F219 /* DOMFileSystem.cpp in Sources */,
899ABCBA1215FAB800F9F219 /* Entry.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -33,7 +33,7 @@
#if ENABLE(FILE_SYSTEM)
#include "Entry.h"
#include "DirectoryEntry.h"
namespace WebCore {
......@@ -43,9 +43,9 @@ DOMFileSystem::DOMFileSystem(const String& name, const String& rootPath)
{
}
PassRefPtr<Entry> DOMFileSystem::root()
PassRefPtr<DirectoryEntry> DOMFileSystem::root()
{
return Entry::create(this, "/");
return DirectoryEntry::create(this, "/");
}
} // namespace
......
......@@ -39,7 +39,7 @@
namespace WebCore {
class Entry;
class DirectoryEntry;
class DOMFileSystem : public RefCounted<DOMFileSystem> {
public:
......@@ -49,7 +49,7 @@ public:
}
const String& name() const { return m_name; }
PassRefPtr<Entry> root();
PassRefPtr<DirectoryEntry> root();
private:
DOMFileSystem(const String& name, const String& rootPath);
......
......@@ -33,6 +33,6 @@ module storage {
Conditional=FILE_SYSTEM
] DOMFileSystem {
readonly attribute DOMString name;
readonly attribute Entry root;
readonly attribute DirectoryEntry root;
};
}
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "DirectoryEntry.h"
#if ENABLE(FILE_SYSTEM)
#include "DirectoryReader.h"
#include "EntryCallback.h"
#include "ErrorCallback.h"
namespace WebCore {
DirectoryEntry::DirectoryEntry(PassRefPtr<DOMFileSystem> fileSystem, const String& fullPath)
: Entry(fileSystem, fullPath)
{
}
PassRefPtr<DirectoryReader> DirectoryEntry::createReader()
{
return DirectoryReader::create(m_fileSystem, m_fullPath);
}
void DirectoryEntry::getFile(const String&, PassRefPtr<Flags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>)
{
// FIXME: to be implemented.
ASSERT_NOT_REACHED();
}
void DirectoryEntry::getDirectory(const String&, PassRefPtr<Flags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>)
{
// FIXME: to be implemented.
ASSERT_NOT_REACHED();
}
} // namespace
#endif // ENABLE(FILE_SYSTEM)
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,