| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/filesystem/DirectoryReader.h" | 32 #include "modules/filesystem/DirectoryReader.h" |
| 33 | 33 |
| 34 #include "core/fileapi/FileError.h" | 34 #include "core/fileapi/FileError.h" |
| 35 #include "modules/filesystem/EntriesCallback.h" | 35 #include "modules/filesystem/EntriesCallback.h" |
| 36 #include "modules/filesystem/EntryArray.h" | 36 #include "modules/filesystem/Entry.h" |
| 37 #include "modules/filesystem/ErrorCallback.h" | 37 #include "modules/filesystem/ErrorCallback.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 DirectoryReader::DirectoryReader(PassRefPtr<DOMFileSystemBase> fileSystem, const
String& fullPath) | 41 DirectoryReader::DirectoryReader(PassRefPtr<DOMFileSystemBase> fileSystem, const
String& fullPath) |
| 42 : DirectoryReaderBase(fileSystem, fullPath) | 42 : DirectoryReaderBase(fileSystem, fullPath) |
| 43 { | 43 { |
| 44 ScriptWrappable::init(this); | 44 ScriptWrappable::init(this); |
| 45 } | 45 } |
| 46 | 46 |
| 47 void DirectoryReader::readEntries(PassRefPtr<EntriesCallback> entriesCallback, P
assRefPtr<ErrorCallback> errorCallback) | 47 void DirectoryReader::readEntries(PassRefPtr<EntriesCallback> entriesCallback, P
assRefPtr<ErrorCallback> errorCallback) |
| 48 { | 48 { |
| 49 if (!m_hasMoreEntries) { | 49 if (!m_hasMoreEntries) { |
| 50 filesystem()->scheduleCallback(entriesCallback, EntryArray::create()); | 50 filesystem()->scheduleCallback(entriesCallback, EntryVector()); |
| 51 return; | 51 return; |
| 52 } | 52 } |
| 53 filesystem()->readDirectory(this, m_fullPath, entriesCallback, errorCallback
); | 53 filesystem()->readDirectory(this, m_fullPath, entriesCallback, errorCallback
); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } | 56 } |
| OLD | NEW |