Introduce WebWorkerPermissionClientProxy to deprecate WorkerAllowMainThreadBridge

Source/web/WorkerFileSystemClient.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 15 matching lines @@
  * 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 "config.h"
 #include "WorkerFileSystemClient.h"
 
 #include "WebWorkerBase.h"
 #include "WorkerAllowMainThreadBridgeBase.h"
+#include "WorkerPermissionClient.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/platform/AsyncFileSystemCallbacks.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFileError.h"
 #include "public/platform/WebFileSystem.h"
 #include "public/platform/WebFileSystemType.h"
 #include "wtf/MainThread.h"
 #include "wtf/Threading.h"
@@ skipping 35 matching lines @@
     return adoptPtr(static_cast<FileSystemClient*>(new WorkerFileSystemClient()));
 }
 
 WorkerFileSystemClient::~WorkerFileSystemClient()
 {
 }
 
 bool WorkerFileSystemClient::allowFileSystem(ExecutionContext* context)
 {
     WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
+    WorkerPermissionClient* permissionClient = WorkerPermissionClient::from(workerGlobalScope);
+    if (permissionClient->proxy())
+        return permissionClient->allowFileSystem();
+
+    // FIXME: Deprecate this bridge code when PermissionClientProxy is
+    // implemented by the embedder.
     WebCore::WorkerThread* workerThread = workerGlobalScope->thread();
     WorkerRunLoop& runLoop = workerThread->runLoop();
     WebCore::WorkerLoaderProxy* workerLoaderProxy = &workerThread->workerLoaderProxy();
 
     String mode = "allowFileSystemMode";
     mode.append(String::number(runLoop.createUniqueId()));
 
     RefPtr<AllowFileSystemMainThreadBridge> bridge = AllowFileSystemMainThreadBridge::create(workerGlobalScope, workerLoaderProxy->toWebWorkerBase(), mode);
 
     // Either the bridge returns, or the queue gets terminated.
     // FIXME: This synchoronous execution should be replaced with better model.
     if (runLoop.runInMode(workerGlobalScope, mode) == MessageQueueTerminated) {
         bridge->cancel();
         return false;
     }
 
     return bridge->result();
 }
 
 WorkerFileSystemClient::WorkerFileSystemClient()
 {
 }
 
 } // namespace WebKit