| Index: third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.h
|
| diff --git a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.h b/third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.h
|
| similarity index 69%
|
| rename from third_party/WebKit/Source/modules/filesystem/DirectoryReader.h
|
| rename to third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.h
|
| index 2c8d26b7a6ffc17db91d953f3311dba7659f4d01..92d2d3f5b379f5d43446da89d33491a930bbf402 100644
|
| --- a/third_party/WebKit/Source/modules/filesystem/DirectoryReader.h
|
| +++ b/third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReader.h
|
| @@ -28,13 +28,13 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef DirectoryReader_h
|
| -#define DirectoryReader_h
|
| +#ifndef FileSystemDirectoryReader_h
|
| +#define FileSystemDirectoryReader_h
|
|
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| -#include "modules/filesystem/DOMFileSystem.h"
|
| -#include "modules/filesystem/DirectoryReaderBase.h"
|
| -#include "modules/filesystem/EntriesCallback.h"
|
| +#include "modules/filesystem/FileSystem.h"
|
| +#include "modules/filesystem/FileSystemDirectoryReaderBase.h"
|
| +#include "modules/filesystem/FileSystemEntriesCallback.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -42,21 +42,22 @@ namespace blink {
|
|
|
| class ErrorCallback;
|
|
|
| -class DirectoryReader : public DirectoryReaderBase, public ScriptWrappable {
|
| +class FileSystemDirectoryReader : public FileSystemDirectoryReaderBase,
|
| + public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
|
|
| public:
|
| - static DirectoryReader* create(DOMFileSystemBase* fileSystem,
|
| - const String& fullPath) {
|
| - return new DirectoryReader(fileSystem, fullPath);
|
| + static FileSystemDirectoryReader* create(FileSystemBase* fileSystem,
|
| + const String& fullPath) {
|
| + return new FileSystemDirectoryReader(fileSystem, fullPath);
|
| }
|
|
|
| - ~DirectoryReader() override;
|
| + ~FileSystemDirectoryReader() override;
|
|
|
| - void readEntries(EntriesCallback*, ErrorCallback* = nullptr);
|
| + void readEntries(FileSystemEntriesCallback*, ErrorCallback* = nullptr);
|
|
|
| - DOMFileSystem* filesystem() const {
|
| - return static_cast<DOMFileSystem*>(m_fileSystem.get());
|
| + FileSystem* filesystem() const {
|
| + return static_cast<FileSystem*>(m_fileSystem.get());
|
| }
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -65,7 +66,7 @@ class DirectoryReader : public DirectoryReaderBase, public ScriptWrappable {
|
| class EntriesCallbackHelper;
|
| class ErrorCallbackHelper;
|
|
|
| - DirectoryReader(DOMFileSystemBase*, const String& fullPath);
|
| + FileSystemDirectoryReader(FileSystemBase*, const String& fullPath);
|
|
|
| void addEntries(const EntryHeapVector& entries);
|
|
|
| @@ -74,10 +75,10 @@ class DirectoryReader : public DirectoryReaderBase, public ScriptWrappable {
|
| bool m_isReading;
|
| EntryHeapVector m_entries;
|
| FileError::ErrorCode m_error = FileError::ErrorCode::kOK;
|
| - Member<EntriesCallback> m_entriesCallback;
|
| + Member<FileSystemEntriesCallback> m_entriesCallback;
|
| Member<ErrorCallback> m_errorCallback;
|
| };
|
|
|
| } // namespace blink
|
|
|
| -#endif // DirectoryReader_h
|
| +#endif // FileSystemDirectoryReader_h
|
|
|