Index: third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp |
diff --git a/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp b/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp |
index 10feb917d8a7e3785788878844c88fbc1b1148bb..3db0b122f1736229ef8fefb15eb657a9570dc7e5 100644 |
--- a/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp |
+++ b/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp |
@@ -42,12 +42,13 @@ |
#include "public/platform/Platform.h" |
#include "public/platform/WebFileSystem.h" |
#include "wtf/Functional.h" |
+#include <memory> |
namespace blink { |
namespace { |
-void reportFailure(PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileError::ErrorCode error) |
+void reportFailure(std::unique_ptr<AsyncFileSystemCallbacks> callbacks, FileError::ErrorCode error) |
{ |
callbacks->didFail(error); |
} |
@@ -56,12 +57,12 @@ void reportFailure(PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileError::Er |
class CallbackWrapper final : public GarbageCollectedFinalized<CallbackWrapper> { |
public: |
- CallbackWrapper(PassOwnPtr<AsyncFileSystemCallbacks> c) |
+ CallbackWrapper(std::unique_ptr<AsyncFileSystemCallbacks> c) |
: m_callbacks(std::move(c)) |
{ |
} |
virtual ~CallbackWrapper() { } |
- PassOwnPtr<AsyncFileSystemCallbacks> release() |
+ std::unique_ptr<AsyncFileSystemCallbacks> release() |
{ |
return std::move(m_callbacks); |
} |
@@ -69,10 +70,10 @@ public: |
DEFINE_INLINE_TRACE() { } |
private: |
- OwnPtr<AsyncFileSystemCallbacks> m_callbacks; |
+ std::unique_ptr<AsyncFileSystemCallbacks> m_callbacks; |
}; |
-LocalFileSystem* LocalFileSystem::create(PassOwnPtr<FileSystemClient> client) |
+LocalFileSystem* LocalFileSystem::create(std::unique_ptr<FileSystemClient> client) |
{ |
return new LocalFileSystem(std::move(client)); |
} |
@@ -81,7 +82,7 @@ LocalFileSystem::~LocalFileSystem() |
{ |
} |
-void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) |
+void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, std::unique_ptr<AsyncFileSystemCallbacks> callbacks) |
{ |
CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks)); |
requestFileSystemAccessInternal(context, |
@@ -89,7 +90,7 @@ void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSyst |
bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper)); |
} |
-void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) |
+void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, std::unique_ptr<AsyncFileSystemCallbacks> callbacks) |
{ |
CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks)); |
requestFileSystemAccessInternal(context, |
@@ -97,7 +98,7 @@ void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemTyp |
bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper)); |
} |
-void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) |
+void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, std::unique_ptr<AsyncFileSystemCallbacks> callbacks) |
{ |
ASSERT(context); |
ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument()); |
@@ -189,7 +190,7 @@ void LocalFileSystem::deleteFileSystemInternal( |
fileSystem->deleteFileSystem(storagePartition, static_cast<WebFileSystemType>(type), callbacks->release()); |
} |
-LocalFileSystem::LocalFileSystem(PassOwnPtr<FileSystemClient> client) |
+LocalFileSystem::LocalFileSystem(std::unique_ptr<FileSystemClient> client) |
: m_client(std::move(client)) |
{ |
} |
@@ -209,12 +210,12 @@ LocalFileSystem* LocalFileSystem::from(ExecutionContext& context) |
return static_cast<LocalFileSystem*>(Supplement<WorkerClients>::from(clients, supplementName())); |
} |
-void provideLocalFileSystemTo(LocalFrame& frame, PassOwnPtr<FileSystemClient> client) |
+void provideLocalFileSystemTo(LocalFrame& frame, std::unique_ptr<FileSystemClient> client) |
{ |
frame.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client))); |
} |
-void provideLocalFileSystemToWorker(WorkerClients* clients, PassOwnPtr<FileSystemClient> client) |
+void provideLocalFileSystemToWorker(WorkerClients* clients, std::unique_ptr<FileSystemClient> client) |
{ |
clients->provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client))); |
} |