Use asynchronized api for file system request. [blink] (3/4)

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 23 matching lines @@
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fileapi/FileError.h"
 #include "core/inspector/InspectorController.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/filesystem/FileSystemClient.h"
 #include "modules/filesystem/InspectorFileSystemAgent.h"
 #include "platform/AsyncFileSystemCallbacks.h"
+#include "platform/PermissionCallbacks.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFileSystem.h"
+#include "wtf/Functional.h"
 
 namespace WebCore {
 
 namespace {
 
 void fileSystemNotAllowed(ExecutionContext*, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     callbacks->didFail(FileError::ABORT_ERR);
 }
 
 } // namespace
 
 PassOwnPtrWillBeRawPtr<LocalFileSystem> LocalFileSystem::create(PassOwnPtr<FileSystemClient> client)
 {
     return adoptPtrWillBeNoop(new LocalFileSystem(client));
 }
 
 LocalFileSystem::~LocalFileSystem()
 {
 }
 
 void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    if (!client() || !client()->allowFileSystem(context)) {
+    if (!client() || !client()->requestFileSystemAccessSync(context)) {

[kinuko, 2014/05/16 10:47:05]

Why we call Sync one here?  resolveURL could be called either in Worker or in
DOMWindow, should we have two versions for this one too?

[Xi Han, 2014/05/16 19:48:44]

Great catch! The deleteFileSystem is the same case. I have updated them both.


On 2014/05/16 10:47:05, kinuko wrote:

         context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
         return;
     }
     blink::Platform::current()->fileSystem()->resolveURL(fileSystemURL, callbacks);
 }
 
-void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
+void LocalFileSystem::requestFileSystemSync(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    if (!client() || !client()->allowFileSystem(context)) {
+    if (!client() || !client()->requestFileSystemAccessSync(context)) {
         context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
         return;
     }
     KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString());
     blink::Platform::current()->fileSystem()->openFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks);
 }
 
+void LocalFileSystem::requestFileSystemAsync(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
+{
+    if (!client()) {
+        context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
+        return;
+    }
+    client()->requestFileSystemAccessAsync(context, PermissionCallbacks::create(
+        bind(&LocalFileSystem::fileSystemAllowedCallbacks, this, context, type, callbacks),

[kinuko, 2014/05/16 10:47:05]

I haven't looked deeper into the bind implementation, but by taking a very rough
look at how ParamStorageTraits<> works don't we need to pass context as
PassRefPtr<> so that we can be sure the ptr's referenced while async call's
ongoing?

[Xi Han, 2014/05/16 19:48:44]

Done.

+        bind(&LocalFileSystem::fileSystemNotAllowedCallbacks, this, context, callbacks)));
+}
+
+void LocalFileSystem::fileSystemNotAllowedCallbacks(
+    ExecutionContext* context,
+    PassOwnPtr<AsyncFileSystemCallbacks> callbacks) {
+    context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
+}
+
+void LocalFileSystem::fileSystemAllowedCallbacks(
+    ExecutionContext* context,
+    FileSystemType type,
+    PassOwnPtr<AsyncFileSystemCallbacks> callbacks) {
+    KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString());
+    blink::Platform::current()->fileSystem()->openFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks);
+}
+
 void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     ASSERT(context);
     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument());
 
-    if (!client() || !client()->allowFileSystem(context)) {
+
+    if (!client() || !client()->requestFileSystemAccessSync(context)) {
         context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
         return;
     }
     KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString());
     blink::Platform::current()->fileSystem()->deleteFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks);
 }
 
 LocalFileSystem::LocalFileSystem(PassOwnPtr<FileSystemClient> client)
     : m_client(client)
 {
@@ skipping 18 matching lines @@
     page.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(client));
     page.inspectorController().registerModuleAgent(InspectorFileSystemAgent::create(&page));
 }
 
 void provideLocalFileSystemToWorker(WorkerClients* clients, PassOwnPtr<FileSystemClient> client)
 {
     clients->provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(client));
 }
 
 } // namespace WebCore