diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/fileapi/DirectoryReader.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/fileapi/DirectoryReader.cpp')
-rw-r--r-- | WebCore/fileapi/DirectoryReader.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/WebCore/fileapi/DirectoryReader.cpp b/WebCore/fileapi/DirectoryReader.cpp index b0eef1c..3437675 100644 --- a/WebCore/fileapi/DirectoryReader.cpp +++ b/WebCore/fileapi/DirectoryReader.cpp @@ -33,23 +33,27 @@ #if ENABLE(FILE_SYSTEM) -#include "DOMFileSystem.h" #include "EntriesCallback.h" +#include "EntryArray.h" #include "ErrorCallback.h" +#include "FileError.h" namespace WebCore { -DirectoryReader::DirectoryReader(PassRefPtr<DOMFileSystem> fileSystem, const String& fullPath) - : m_fileSystem(fileSystem) - , m_fullPath(fullPath) +DirectoryReader::DirectoryReader(DOMFileSystemBase* fileSystem, const String& fullPath) + : DirectoryReaderBase(fileSystem, fullPath) { } void DirectoryReader::readEntries(PassRefPtr<EntriesCallback> entriesCallback, PassRefPtr<ErrorCallback> errorCallback) { - m_fileSystem->readDirectory(m_fullPath, entriesCallback, errorCallback); + if (!m_hasMoreEntries) { + filesystem()->scheduleCallback(entriesCallback, EntryArray::create()); + return; + } + filesystem()->readDirectory(this, m_fullPath, entriesCallback, errorCallback); } -} // namespace +} #endif // ENABLE(FILE_SYSTEM) |