FileSystem: Migrate ExecutionContextTask to WTF::Closure

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

 /*
  * Copyright (C) 2010 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/filesystem/DOMFileSystem.h"
 
 #include "core/fileapi/BlobCallback.h"
+#include "core/inspector/InspectorInstrumentation.h"
 #include "modules/filesystem/DOMFilePath.h"
 #include "modules/filesystem/DirectoryEntry.h"
 #include "modules/filesystem/FileEntry.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
 #include "modules/filesystem/FileWriter.h"
 #include "modules/filesystem/FileWriterBaseCallback.h"
 #include "modules/filesystem/FileWriterCallback.h"
 #include "modules/filesystem/MetadataCallback.h"
 #include "platform/FileMetadata.h"
+#include "platform/WebTaskRunner.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFileSystem.h"
 #include "public/platform/WebFileSystemCallbacks.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
 
 namespace blink {
 
+namespace {
+
+void runCallback(ExecutionContext* executionContext,
+                 std::unique_ptr<WTF::Closure> task) {
+  DCHECK(executionContext->isContextThread());
+  InspectorInstrumentation::AsyncTask asyncTask(executionContext, task.get(),
+                                                true /* isInstrumented */);
+  (*task)();
+}
+
+}  // namespace
+
 // static
 DOMFileSystem* DOMFileSystem::create(ExecutionContext* context,
                                      const String& name,
                                      FileSystemType type,
                                      const KURL& rootURL) {
   return new DOMFileSystem(context, name, type, rootURL);
 }
 
 DOMFileSystem* DOMFileSystem::createIsolatedFileSystem(
     ExecutionContext* context,
@@ skipping 51 matching lines @@
 }
 
 void DOMFileSystem::reportError(ErrorCallbackBase* errorCallback,
                                 FileError::ErrorCode fileError) {
   reportError(getExecutionContext(), errorCallback, fileError);
 }
 
 void DOMFileSystem::reportError(ExecutionContext* executionContext,
                                 ErrorCallbackBase* errorCallback,
                                 FileError::ErrorCode fileError) {
-  if (errorCallback)
-    scheduleCallback(
-        executionContext,
-        createSameThreadTask(&ErrorCallbackBase::invoke,
+  if (!errorCallback)
+    return;
+  scheduleCallback(executionContext,
+                   WTF::bind(&ErrorCallbackBase::invoke,
                              wrapPersistent(errorCallback), fileError));
 }
 
 namespace {
 
 class ConvertToFileWriterCallback : public FileWriterBaseCallback {
  public:
   static ConvertToFileWriterCallback* create(FileWriterCallback* callback) {
     return new ConvertToFileWriterCallback(callback);
   }
@@ skipping 43 matching lines @@
     reportError(errorCallback, FileError::kAbortErr);
     return;
   }
 
   fileSystem()->createSnapshotFileAndReadMetadata(
       fileSystemURL,
       SnapshotFileCallback::create(this, fileEntry->name(), fileSystemURL,
                                    successCallback, errorCallback, m_context));
 }
 
+void DOMFileSystem::scheduleCallback(ExecutionContext* executionContext,
+                                     std::unique_ptr<WTF::Closure> task) {
+  DCHECK(executionContext->isContextThread());
+  InspectorInstrumentation::asyncTaskScheduled(
+      executionContext, taskNameForInstrumentation(), task.get());
+  TaskRunnerHelper::get(TaskType::FileReading, executionContext)
+      ->postTask(BLINK_FROM_HERE,
+                 WTF::bind(&runCallback, wrapPersistent(executionContext),

[tzik, 2017/01/19 04:16:09]

Can we use wrapWeakPersistent and check its value in runCallback to keep the old
behavior?

[nhiroki, 2017/01/19 04:33:40]

Done.

+                           WTF::passed(std::move(task))));
+}
+
 DEFINE_TRACE(DOMFileSystem) {
   DOMFileSystemBase::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
   visitor->trace(m_rootEntry);
 }
 
 }  // namespace blink