Index: third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp |
diff --git a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp |
index b88517d57b02c90ab6f93b61a61eb835ad138b49..34c58f2c8e3597a53bcd0087ce3f69c5cf225edf 100644 |
--- a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp |
+++ b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp |
@@ -51,6 +51,8 @@ |
#include "modules/filesystem/MetadataCallback.h" |
#include "platform/FileMetadata.h" |
#include "public/platform/WebFileWriter.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -104,9 +106,9 @@ void FileSystemCallbacksBase::handleEventOrScheduleCallback(CB* callback) |
// EntryCallbacks ------------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> EntryCallbacks::create(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem, const String& expectedPath, bool isDirectory) |
+std::unique_ptr<AsyncFileSystemCallbacks> EntryCallbacks::create(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem, const String& expectedPath, bool isDirectory) |
{ |
- return adoptPtr(new EntryCallbacks(successCallback, errorCallback, context, fileSystem, expectedPath, isDirectory)); |
+ return wrapUnique(new EntryCallbacks(successCallback, errorCallback, context, fileSystem, expectedPath, isDirectory)); |
} |
EntryCallbacks::EntryCallbacks(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem, const String& expectedPath, bool isDirectory) |
@@ -129,9 +131,9 @@ void EntryCallbacks::didSucceed() |
// EntriesCallbacks ----------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> EntriesCallbacks::create(EntriesCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DirectoryReaderBase* directoryReader, const String& basePath) |
+std::unique_ptr<AsyncFileSystemCallbacks> EntriesCallbacks::create(EntriesCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DirectoryReaderBase* directoryReader, const String& basePath) |
{ |
- return adoptPtr(new EntriesCallbacks(successCallback, errorCallback, context, directoryReader, basePath)); |
+ return wrapUnique(new EntriesCallbacks(successCallback, errorCallback, context, directoryReader, basePath)); |
} |
EntriesCallbacks::EntriesCallbacks(EntriesCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DirectoryReaderBase* directoryReader, const String& basePath) |
@@ -163,9 +165,9 @@ void EntriesCallbacks::didReadDirectoryEntries(bool hasMore) |
// FileSystemCallbacks -------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> FileSystemCallbacks::create(FileSystemCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, FileSystemType type) |
+std::unique_ptr<AsyncFileSystemCallbacks> FileSystemCallbacks::create(FileSystemCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, FileSystemType type) |
{ |
- return adoptPtr(new FileSystemCallbacks(successCallback, errorCallback, context, type)); |
+ return wrapUnique(new FileSystemCallbacks(successCallback, errorCallback, context, type)); |
} |
FileSystemCallbacks::FileSystemCallbacks(FileSystemCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, FileSystemType type) |
@@ -183,9 +185,9 @@ void FileSystemCallbacks::didOpenFileSystem(const String& name, const KURL& root |
// ResolveURICallbacks -------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> ResolveURICallbacks::create(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
+std::unique_ptr<AsyncFileSystemCallbacks> ResolveURICallbacks::create(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
{ |
- return adoptPtr(new ResolveURICallbacks(successCallback, errorCallback, context)); |
+ return wrapUnique(new ResolveURICallbacks(successCallback, errorCallback, context)); |
} |
ResolveURICallbacks::ResolveURICallbacks(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
@@ -213,9 +215,9 @@ void ResolveURICallbacks::didResolveURL(const String& name, const KURL& rootURL, |
// MetadataCallbacks ---------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> MetadataCallbacks::create(MetadataCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem) |
+std::unique_ptr<AsyncFileSystemCallbacks> MetadataCallbacks::create(MetadataCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem) |
{ |
- return adoptPtr(new MetadataCallbacks(successCallback, errorCallback, context, fileSystem)); |
+ return wrapUnique(new MetadataCallbacks(successCallback, errorCallback, context, fileSystem)); |
} |
MetadataCallbacks::MetadataCallbacks(MetadataCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem) |
@@ -232,9 +234,9 @@ void MetadataCallbacks::didReadMetadata(const FileMetadata& metadata) |
// FileWriterBaseCallbacks ---------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> FileWriterBaseCallbacks::create(FileWriterBase* fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
+std::unique_ptr<AsyncFileSystemCallbacks> FileWriterBaseCallbacks::create(FileWriterBase* fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
{ |
- return adoptPtr(new FileWriterBaseCallbacks(fileWriter, successCallback, errorCallback, context)); |
+ return wrapUnique(new FileWriterBaseCallbacks(fileWriter, successCallback, errorCallback, context)); |
} |
FileWriterBaseCallbacks::FileWriterBaseCallbacks(FileWriterBase* fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
@@ -244,7 +246,7 @@ FileWriterBaseCallbacks::FileWriterBaseCallbacks(FileWriterBase* fileWriter, Fil |
{ |
} |
-void FileWriterBaseCallbacks::didCreateFileWriter(PassOwnPtr<WebFileWriter> fileWriter, long long length) |
+void FileWriterBaseCallbacks::didCreateFileWriter(std::unique_ptr<WebFileWriter> fileWriter, long long length) |
{ |
m_fileWriter->initialize(std::move(fileWriter), length); |
if (m_successCallback) |
@@ -253,9 +255,9 @@ void FileWriterBaseCallbacks::didCreateFileWriter(PassOwnPtr<WebFileWriter> file |
// SnapshotFileCallback ------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> SnapshotFileCallback::create(DOMFileSystemBase* filesystem, const String& name, const KURL& url, BlobCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
+std::unique_ptr<AsyncFileSystemCallbacks> SnapshotFileCallback::create(DOMFileSystemBase* filesystem, const String& name, const KURL& url, BlobCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
{ |
- return adoptPtr(new SnapshotFileCallback(filesystem, name, url, successCallback, errorCallback, context)); |
+ return wrapUnique(new SnapshotFileCallback(filesystem, name, url, successCallback, errorCallback, context)); |
} |
SnapshotFileCallback::SnapshotFileCallback(DOMFileSystemBase* filesystem, const String& name, const KURL& url, BlobCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context) |
@@ -281,9 +283,9 @@ void SnapshotFileCallback::didCreateSnapshotFile(const FileMetadata& metadata, P |
// VoidCallbacks -------------------------------------------------------------- |
-PassOwnPtr<AsyncFileSystemCallbacks> VoidCallbacks::create(VoidCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem) |
+std::unique_ptr<AsyncFileSystemCallbacks> VoidCallbacks::create(VoidCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem) |
{ |
- return adoptPtr(new VoidCallbacks(successCallback, errorCallback, context, fileSystem)); |
+ return wrapUnique(new VoidCallbacks(successCallback, errorCallback, context, fileSystem)); |
} |
VoidCallbacks::VoidCallbacks(VoidCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem) |