Web expose FileSystemFileEntry, FileSystemDirectoryEntry and friends

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

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 2011 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #include "modules/filesystem/WorkerGlobalScopeFileSystem.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/fileapi/FileError.h"
 #include "core/workers/WorkerGlobalScope.h"
-#include "modules/filesystem/DOMFileSystemBase.h"
-#include "modules/filesystem/DirectoryEntrySync.h"
 #include "modules/filesystem/ErrorCallback.h"
-#include "modules/filesystem/FileEntrySync.h"
+#include "modules/filesystem/FileSystemBase.h"
 #include "modules/filesystem/FileSystemCallback.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
+#include "modules/filesystem/FileSystemDirectoryEntrySync.h"
+#include "modules/filesystem/FileSystemFileEntrySync.h"
 #include "modules/filesystem/LocalFileSystem.h"
 #include "modules/filesystem/SyncCallbackHelper.h"
 #include "platform/FileSystemType.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include <memory>
 
 namespace blink {
 
 void WorkerGlobalScopeFileSystem::webkitRequestFileSystem(
     WorkerGlobalScope& worker,
     int type,
     long long size,
     FileSystemCallback* successCallback,
     ErrorCallback* errorCallback) {
   ExecutionContext* secureContext = worker.getExecutionContext();
   if (!secureContext->getSecurityOrigin()->canAccessFileSystem()) {
-    DOMFileSystem::reportError(&worker,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kSecurityErr);
+    FileSystem::reportError(&worker, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kSecurityErr);
     return;
   }
 
   FileSystemType fileSystemType = static_cast<FileSystemType>(type);
-  if (!DOMFileSystemBase::isValidType(fileSystemType)) {
-    DOMFileSystem::reportError(&worker,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kInvalidModificationErr);
+  if (!FileSystemBase::isValidType(fileSystemType)) {
+    FileSystem::reportError(&worker, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kInvalidModificationErr);
     return;
   }
 
   LocalFileSystem::from(worker)->requestFileSystem(
       &worker, fileSystemType, size,
       FileSystemCallbacks::create(successCallback,
                                   ScriptErrorCallback::wrap(errorCallback),
                                   &worker, fileSystemType));
 }
 
-DOMFileSystemSync* WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync(
+FileSystemSync* WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync(
     WorkerGlobalScope& worker,
     int type,
     long long size,
     ExceptionState& exceptionState) {
   ExecutionContext* secureContext = worker.getExecutionContext();
   if (!secureContext->getSecurityOrigin()->canAccessFileSystem()) {
     exceptionState.throwSecurityError(FileError::securityErrorMessage);
     return 0;
   }
 
   FileSystemType fileSystemType = static_cast<FileSystemType>(type);
-  if (!DOMFileSystemBase::isValidType(fileSystemType)) {
+  if (!FileSystemBase::isValidType(fileSystemType)) {
     exceptionState.throwDOMException(
         InvalidModificationError,
         "the type must be kTemporary or kPersistent.");
     return 0;
   }
 
   FileSystemSyncCallbackHelper* helper = FileSystemSyncCallbackHelper::create();
   std::unique_ptr<AsyncFileSystemCallbacks> callbacks =
       FileSystemCallbacks::create(helper->getSuccessCallback(),
                                   helper->getErrorCallback(), &worker,
                                   fileSystemType);
   callbacks->setShouldBlockUntilCompletion(true);
 
   LocalFileSystem::from(worker)->requestFileSystem(&worker, fileSystemType,
                                                    size, std::move(callbacks));
   return helper->getResult(exceptionState);
 }
 
 void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(
     WorkerGlobalScope& worker,
     const String& url,
-    EntryCallback* successCallback,
+    FileSystemEntryCallback* successCallback,
     ErrorCallback* errorCallback) {
   KURL completedURL = worker.completeURL(url);
   ExecutionContext* secureContext = worker.getExecutionContext();
   if (!secureContext->getSecurityOrigin()->canAccessFileSystem() ||
       !secureContext->getSecurityOrigin()->canRequest(completedURL)) {
-    DOMFileSystem::reportError(&worker,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kSecurityErr);
+    FileSystem::reportError(&worker, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kSecurityErr);
     return;
   }
 
   if (!completedURL.isValid()) {
-    DOMFileSystem::reportError(&worker,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kEncodingErr);
+    FileSystem::reportError(&worker, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kEncodingErr);
     return;
   }
 
   LocalFileSystem::from(worker)->resolveURL(
       &worker, completedURL,
       ResolveURICallbacks::create(
           successCallback, ScriptErrorCallback::wrap(errorCallback), &worker));
 }
 
-EntrySync* WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL(
+FileSystemEntrySync*
+WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL(
     WorkerGlobalScope& worker,
     const String& url,
     ExceptionState& exceptionState) {
   KURL completedURL = worker.completeURL(url);
   ExecutionContext* secureContext = worker.getExecutionContext();
   if (!secureContext->getSecurityOrigin()->canAccessFileSystem() ||
       !secureContext->getSecurityOrigin()->canRequest(completedURL)) {
     exceptionState.throwSecurityError(FileError::securityErrorMessage);
     return 0;
   }
@@ skipping 20 matching lines @@
 static_assert(static_cast<int>(WorkerGlobalScopeFileSystem::kTemporary) ==
                   static_cast<int>(FileSystemTypeTemporary),
               "WorkerGlobalScopeFileSystem::kTemporary should match "
               "FileSystemTypeTemporary");
 static_assert(static_cast<int>(WorkerGlobalScopeFileSystem::kPersistent) ==
                   static_cast<int>(FileSystemTypePersistent),
               "WorkerGlobalScopeFileSystem::kPersistent should match "
               "FileSystemTypePersistent");
 
 }  // namespace blink