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"
+#include "wtf/RefCounted.h"
 
 namespace WebCore {
 
 namespace {
 
 void fileSystemNotAllowed(ExecutionContext*, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     callbacks->didFail(FileError::ABORT_ERR);
 }
 
 } // namespace
 
+class CallbackWrapper : public RefCounted<CallbackWrapper> {
+public:
+    CallbackWrapper(PassOwnPtr<AsyncFileSystemCallbacks> c)
+        : m_callbacks(c)
+    {
+    }
+    virtual ~CallbackWrapper() { }
+    PassOwnPtr<AsyncFileSystemCallbacks> release()
+    {
+        return m_callbacks.release();
+    }
+
+private:
+    OwnPtr<AsyncFileSystemCallbacks> m_callbacks;
+};
+
 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)) {
-        context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
-        return;
-    }
-    blink::Platform::current()->fileSystem()->resolveURL(fileSystemURL, callbacks);
+    RefPtr<CallbackWrapper> wrapper = adoptRef(new CallbackWrapper(callbacks));
+    requestFileSystemAccessInternal(context,
+        bind(&LocalFileSystem::resolveURLInternal, this, fileSystemURL, wrapper),
+        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, PassRefPtr<ExecutionContext>(context), wrapper));
 }
 
 void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    if (!client() || !client()->allowFileSystem(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);
+    RefPtr<ExecutionContext> contextPtr(context);
+    RefPtr<CallbackWrapper> wrapper = adoptRef(new CallbackWrapper(callbacks));
+    requestFileSystemAccessInternal(context,
+        bind(&LocalFileSystem::fileSystemAllowedInternal, this, contextPtr, type, wrapper),
+        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, contextPtr, wrapper));
 }
 
 void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
+    RefPtr<ExecutionContext> contextPtr(context);
     ASSERT(context);
     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument());
 
-    if (!client() || !client()->allowFileSystem(context)) {
-        context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks));
+    RefPtr<CallbackWrapper> wrapper = adoptRef(new CallbackWrapper(callbacks));
+    requestFileSystemAccessInternal(context,
+        bind(&LocalFileSystem::deleteFileSystemInternal, this, contextPtr, type, wrapper),
+        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, contextPtr, wrapper));
+}
+
+void LocalFileSystem::requestFileSystemAccessInternal(ExecutionContext* context, const Closure& allowed, const Closure& denied)
+{
+    if (!client()) {
+        denied();
         return;
     }
+    if (!context->isDocument()) {
+        if (!client()->requestFileSystemAccessSync(context)) {
+            denied();
+            return;
+        }
+        allowed();
+        return;
+    }
+    client()->requestFileSystemAccessAsync(context, PermissionCallbacks::create(allowed, denied));
+}
+
+void LocalFileSystem::fileSystemNotAllowedInternal(
+    PassRefPtr<ExecutionContext> context,
+    PassRefPtr<CallbackWrapper> callbacks)
+{
+    context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks->release()));
+}
+
+void LocalFileSystem::fileSystemAllowedInternal(
+    PassRefPtr<ExecutionContext> context,
+    FileSystemType type,
+    PassRefPtr<CallbackWrapper> callbacks)
+{
     KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString());
-    blink::Platform::current()->fileSystem()->deleteFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks);
+    blink::Platform::current()->fileSystem()->openFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks->release());
+}
+
+void LocalFileSystem::resolveURLInternal(
+    const KURL& fileSystemURL,
+    PassRefPtr<CallbackWrapper> callbacks)
+{
+    blink::Platform::current()->fileSystem()->resolveURL(fileSystemURL, callbacks->release());
+}
+
+void LocalFileSystem::deleteFileSystemInternal(
+    PassRefPtr<ExecutionContext> context,
+    FileSystemType type,
+    PassRefPtr<CallbackWrapper> callbacks)
+{
+    KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString());
+    blink::Platform::current()->fileSystem()->deleteFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks->release());
 }
 
 LocalFileSystem::LocalFileSystem(PassOwnPtr<FileSystemClient> client)
     : m_client(client)
 {
 }
 
 const char* LocalFileSystem::supplementName()
 {
     return "LocalFileSystem";
@@ skipping 13 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