| Index: Source/modules/filesystem/DOMFileSystemBase.h
|
| diff --git a/Source/modules/filesystem/DOMFileSystemBase.h b/Source/modules/filesystem/DOMFileSystemBase.h
|
| index f488837a3687f1001d9b56d8ff03c61e5caf736d..a8b5d76fe77f327af88f7cfae581a98e21e646f1 100644
|
| --- a/Source/modules/filesystem/DOMFileSystemBase.h
|
| +++ b/Source/modules/filesystem/DOMFileSystemBase.h
|
| @@ -81,7 +81,7 @@ public:
|
| virtual void removePendingCallbacks() { }
|
|
|
| // Overridden by subclasses to handle sync vs async error-handling.
|
| - virtual void reportError(PassOwnPtrWillBeRawPtr<ErrorCallback>, PassRefPtrWillBeRawPtr<FileError>) = 0;
|
| + virtual void reportError(ErrorCallback*, PassRefPtrWillBeRawPtr<FileError>) = 0;
|
|
|
| const String& name() const { return m_name; }
|
| FileSystemType type() const { return m_type; }
|
| @@ -106,15 +106,15 @@ public:
|
| static PassRefPtrWillBeRawPtr<File> createFile(const FileMetadata&, const KURL& fileSystemURL, FileSystemType, const String name);
|
|
|
| // Actual FileSystem API implementations. All the validity checks on virtual paths are done at this level.
|
| - void getMetadata(const EntryBase*, PassOwnPtrWillBeRawPtr<MetadataCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - void move(const EntryBase* source, EntryBase* parent, const String& name, PassOwnPtrWillBeRawPtr<EntryCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - void copy(const EntryBase* source, EntryBase* parent, const String& name, PassOwnPtrWillBeRawPtr<EntryCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - void remove(const EntryBase*, PassOwnPtrWillBeRawPtr<VoidCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - void removeRecursively(const EntryBase*, PassOwnPtrWillBeRawPtr<VoidCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - void getParent(const EntryBase*, PassOwnPtrWillBeRawPtr<EntryCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>);
|
| - void getFile(const EntryBase*, const String& path, const FileSystemFlags&, PassOwnPtrWillBeRawPtr<EntryCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - void getDirectory(const EntryBase*, const String& path, const FileSystemFlags&, PassOwnPtrWillBeRawPtr<EntryCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| - int readDirectory(DirectoryReaderBase*, const String& path, PassOwnPtrWillBeRawPtr<EntriesCallback>, PassOwnPtrWillBeRawPtr<ErrorCallback>, SynchronousType = Asynchronous);
|
| + void getMetadata(const EntryBase*, MetadataCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + void move(const EntryBase* source, EntryBase* parent, const String& name, EntryCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + void copy(const EntryBase* source, EntryBase* parent, const String& name, EntryCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + void remove(const EntryBase*, VoidCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + void removeRecursively(const EntryBase*, VoidCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + void getParent(const EntryBase*, EntryCallback*, ErrorCallback*);
|
| + void getFile(const EntryBase*, const String& path, const FileSystemFlags&, EntryCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + void getDirectory(const EntryBase*, const String& path, const FileSystemFlags&, EntryCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| + int readDirectory(DirectoryReaderBase*, const String& path, EntriesCallback*, ErrorCallback*, SynchronousType = Asynchronous);
|
| bool waitForAdditionalResult(int callbacksId);
|
|
|
| virtual void trace(Visitor*) { }
|
|
|