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 da84a2d8753372cc2ef6b415ea07a8e9a079aeed..3a4cfc43668ff63ad16ee37c7d6e8bac479f181e 100644 |
--- a/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp |
+++ b/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp |
@@ -86,16 +86,16 @@ void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSyst |
{ |
CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks)); |
requestFileSystemAccessInternal(context, |
- WTF::bind(&LocalFileSystem::resolveURLInternal, wrapPersistent(this), wrapPersistent(context), fileSystemURL, wrapPersistent(wrapper)), |
- WTF::bind(&LocalFileSystem::fileSystemNotAllowedInternal, wrapPersistent(this), wrapPersistent(context), wrapPersistent(wrapper))); |
+ WTF::bind(&LocalFileSystem::resolveURLInternal, wrapCrossThreadPersistent(this), wrapPersistent(context), fileSystemURL, wrapPersistent(wrapper)), |
+ WTF::bind(&LocalFileSystem::fileSystemNotAllowedInternal, wrapCrossThreadPersistent(this), wrapPersistent(context), wrapPersistent(wrapper))); |
haraken
2016/09/14 07:34:41
Let's make this change in a separate CL.
keishi
2016/09/21 04:57:25
Done.
|
} |
void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, std::unique_ptr<AsyncFileSystemCallbacks> callbacks) |
{ |
CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks)); |
requestFileSystemAccessInternal(context, |
- WTF::bind(&LocalFileSystem::fileSystemAllowedInternal, wrapPersistent(this), wrapPersistent(context), type, wrapPersistent(wrapper)), |
- WTF::bind(&LocalFileSystem::fileSystemNotAllowedInternal, wrapPersistent(this), wrapPersistent(context), wrapPersistent(wrapper))); |
+ WTF::bind(&LocalFileSystem::fileSystemAllowedInternal, wrapCrossThreadPersistent(this), wrapPersistent(context), type, wrapPersistent(wrapper)), |
+ WTF::bind(&LocalFileSystem::fileSystemNotAllowedInternal, wrapCrossThreadPersistent(this), wrapPersistent(context), wrapPersistent(wrapper))); |
} |
void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, std::unique_ptr<AsyncFileSystemCallbacks> callbacks) |
@@ -105,8 +105,8 @@ void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType |
CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks)); |
requestFileSystemAccessInternal(context, |
- WTF::bind(&LocalFileSystem::deleteFileSystemInternal, wrapPersistent(this), wrapPersistent(context), type, wrapPersistent(wrapper)), |
- WTF::bind(&LocalFileSystem::fileSystemNotAllowedInternal, wrapPersistent(this), wrapPersistent(context), wrapPersistent(wrapper))); |
+ WTF::bind(&LocalFileSystem::deleteFileSystemInternal, wrapCrossThreadPersistent(this), wrapPersistent(context), type, wrapPersistent(wrapper)), |
+ WTF::bind(&LocalFileSystem::fileSystemNotAllowedInternal, wrapCrossThreadPersistent(this), wrapPersistent(context), wrapPersistent(wrapper))); |
} |
WebFileSystem* LocalFileSystem::getFileSystem() const |