| Index: Source/modules/filesystem/DOMFileSystemBase.cpp
|
| diff --git a/Source/modules/filesystem/DOMFileSystemBase.cpp b/Source/modules/filesystem/DOMFileSystemBase.cpp
|
| index 2456097599572c3810e3f19eeb0ca1bdf9c3d55c..77cfe569ac71f5dde0471466ef18c4eea705a5e1 100644
|
| --- a/Source/modules/filesystem/DOMFileSystemBase.cpp
|
| +++ b/Source/modules/filesystem/DOMFileSystemBase.cpp
|
| @@ -208,7 +208,7 @@ PassRefPtrWillBeRawPtr<File> DOMFileSystemBase::createFile(const FileMetadata& m
|
| return File::createForFileSystemFile(fileSystemURL, metadata);
|
| }
|
|
|
| -void DOMFileSystemBase::getMetadata(const EntryBase* entry, PassOwnPtrWillBeRawPtr<MetadataCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::getMetadata(const EntryBase* entry, MetadataCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -249,7 +249,7 @@ static bool verifyAndGetDestinationPathForCopyOrMove(const EntryBase* source, En
|
| return true;
|
| }
|
|
|
| -void DOMFileSystemBase::move(const EntryBase* source, EntryBase* parent, const String& newName, PassOwnPtrWillBeRawPtr<EntryCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::move(const EntryBase* source, EntryBase* parent, const String& newName, EntryCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -268,7 +268,7 @@ void DOMFileSystemBase::move(const EntryBase* source, EntryBase* parent, const S
|
| fileSystem()->move(createFileSystemURL(source), parent->filesystem()->createFileSystemURL(destinationPath), callbacks.release());
|
| }
|
|
|
| -void DOMFileSystemBase::copy(const EntryBase* source, EntryBase* parent, const String& newName, PassOwnPtrWillBeRawPtr<EntryCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::copy(const EntryBase* source, EntryBase* parent, const String& newName, EntryCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -287,7 +287,7 @@ void DOMFileSystemBase::copy(const EntryBase* source, EntryBase* parent, const S
|
| fileSystem()->copy(createFileSystemURL(source), parent->filesystem()->createFileSystemURL(destinationPath), callbacks.release());
|
| }
|
|
|
| -void DOMFileSystemBase::remove(const EntryBase* entry, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::remove(const EntryBase* entry, VoidCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -307,7 +307,7 @@ void DOMFileSystemBase::remove(const EntryBase* entry, PassOwnPtrWillBeRawPtr<Vo
|
| fileSystem()->remove(createFileSystemURL(entry), callbacks.release());
|
| }
|
|
|
| -void DOMFileSystemBase::removeRecursively(const EntryBase* entry, PassOwnPtrWillBeRawPtr<VoidCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::removeRecursively(const EntryBase* entry, VoidCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -327,7 +327,7 @@ void DOMFileSystemBase::removeRecursively(const EntryBase* entry, PassOwnPtrWill
|
| fileSystem()->removeRecursively(createFileSystemURL(entry), callbacks.release());
|
| }
|
|
|
| -void DOMFileSystemBase::getParent(const EntryBase* entry, PassOwnPtrWillBeRawPtr<EntryCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback)
|
| +void DOMFileSystemBase::getParent(const EntryBase* entry, EntryCallback* successCallback, ErrorCallback* errorCallback)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -340,7 +340,7 @@ void DOMFileSystemBase::getParent(const EntryBase* entry, PassOwnPtrWillBeRawPtr
|
| fileSystem()->directoryExists(createFileSystemURL(path), EntryCallbacks::create(successCallback, errorCallback, m_context, this, path, true));
|
| }
|
|
|
| -void DOMFileSystemBase::getFile(const EntryBase* entry, const String& path, const FileSystemFlags& flags, PassOwnPtrWillBeRawPtr<EntryCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::getFile(const EntryBase* entry, const String& path, const FileSystemFlags& flags, EntryCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -362,7 +362,7 @@ void DOMFileSystemBase::getFile(const EntryBase* entry, const String& path, cons
|
| fileSystem()->fileExists(createFileSystemURL(absolutePath), callbacks.release());
|
| }
|
|
|
| -void DOMFileSystemBase::getDirectory(const EntryBase* entry, const String& path, const FileSystemFlags& flags, PassOwnPtrWillBeRawPtr<EntryCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +void DOMFileSystemBase::getDirectory(const EntryBase* entry, const String& path, const FileSystemFlags& flags, EntryCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
| @@ -384,7 +384,7 @@ void DOMFileSystemBase::getDirectory(const EntryBase* entry, const String& path,
|
| fileSystem()->directoryExists(createFileSystemURL(absolutePath), callbacks.release());
|
| }
|
|
|
| -int DOMFileSystemBase::readDirectory(DirectoryReaderBase* reader, const String& path, PassOwnPtrWillBeRawPtr<EntriesCallback> successCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback, SynchronousType synchronousType)
|
| +int DOMFileSystemBase::readDirectory(DirectoryReaderBase* reader, const String& path, EntriesCallback* successCallback, ErrorCallback* errorCallback, SynchronousType synchronousType)
|
| {
|
| if (!fileSystem()) {
|
| reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
|
|
|