Prepare DedicatedWorker for per thread heap

third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 68 matching lines @@
 }
 
 LocalFileSystem::~LocalFileSystem()
 {
 }
 
 void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, std::unique_ptr<AsyncFileSystemCallbacks> callbacks)
 {
     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)
 {
     ASSERT(context);
     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument());
 
     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
 {
     Platform* platform = Platform::current();
     if (!platform)
         return nullptr;
 
     return platform->fileSystem();
 }
@@ skipping 100 matching lines @@
 {
     frame.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client)));
 }
 
 void provideLocalFileSystemToWorker(WorkerClients* clients, std::unique_ptr<FileSystemClient> client)
 {
     clients->provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client)));
 }
 
 } // namespace blink