From 88f21fabf2f38885923cd22475d9f392310931a8 Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Wed, 8 Mar 2017 20:15:45 +0100 Subject: [PATCH] Bug 1299500 - Get rid of DeviceStorage API - part 9 - Directory::GetRoot, r=ehsan --- dom/devicestorage/nsDeviceStorage.cpp | 2 +- dom/filesystem/Directory.cpp | 25 --------------------- dom/filesystem/Directory.h | 3 --- dom/filesystem/GetFileOrDirectoryTask.cpp | 6 ++--- dom/filesystem/GetFileOrDirectoryTask.h | 5 +---- dom/filesystem/PFileSystemParams.ipdlh | 6 ----- dom/filesystem/PFileSystemRequest.ipdl | 6 ----- dom/filesystem/compat/CallbackRunnables.cpp | 2 +- 8 files changed, 5 insertions(+), 50 deletions(-) diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp index 37ab04799953f..d5f0748bde82a 100644 --- a/dom/devicestorage/nsDeviceStorage.cpp +++ b/dom/devicestorage/nsDeviceStorage.cpp @@ -3471,7 +3471,7 @@ nsDOMDeviceStorage::GetRoot(ErrorResult& aRv) mFileSystem = new DeviceStorageFileSystem(mStorageType, mStorageName); mFileSystem->Init(this); } - return mozilla::dom::Directory::GetRoot(mFileSystem, aRv); + return nullptr; } void diff --git a/dom/filesystem/Directory.cpp b/dom/filesystem/Directory.cpp index f264bebb56737..828da547baaba 100644 --- a/dom/filesystem/Directory.cpp +++ b/dom/filesystem/Directory.cpp @@ -8,7 +8,6 @@ #include "FileSystemPermissionRequest.h" #include "GetDirectoryListingTask.h" -#include "GetFileOrDirectoryTask.h" #include "GetFilesTask.h" #include "WorkerPrivate.h" @@ -67,30 +66,6 @@ Directory::WebkitBlinkDirectoryPickerEnabled(JSContext* aCx, JSObject* aObj) return workerPrivate->WebkitBlinkDirectoryPickerEnabled(); } -/* static */ already_AddRefed -Directory::GetRoot(FileSystemBase* aFileSystem, ErrorResult& aRv) -{ - // Only exposed for DeviceStorage. - MOZ_ASSERT(NS_IsMainThread()); - MOZ_ASSERT(aFileSystem); - - nsCOMPtr path; - aRv = NS_NewLocalFile(aFileSystem->LocalOrDeviceStorageRootPath(), - true, getter_AddRefs(path)); - if (NS_WARN_IF(aRv.Failed())) { - return nullptr; - } - - RefPtr task = - GetFileOrDirectoryTaskChild::Create(aFileSystem, path, true, aRv); - if (NS_WARN_IF(aRv.Failed())) { - return nullptr; - } - - FileSystemPermissionRequest::RequestForTask(task); - return task->GetPromise(); -} - /* static */ already_AddRefed Directory::Constructor(const GlobalObject& aGlobal, const nsAString& aRealPath, diff --git a/dom/filesystem/Directory.h b/dom/filesystem/Directory.h index a13e7c103f672..3a532e043e09f 100644 --- a/dom/filesystem/Directory.h +++ b/dom/filesystem/Directory.h @@ -32,9 +32,6 @@ class Directory final static bool WebkitBlinkDirectoryPickerEnabled(JSContext* aCx, JSObject* aObj); - static already_AddRefed - GetRoot(FileSystemBase* aFileSystem, ErrorResult& aRv); - static already_AddRefed Constructor(const GlobalObject& aGlobal, const nsAString& aRealPath, diff --git a/dom/filesystem/GetFileOrDirectoryTask.cpp b/dom/filesystem/GetFileOrDirectoryTask.cpp index 1771203e04541..2a609718e79f7 100644 --- a/dom/filesystem/GetFileOrDirectoryTask.cpp +++ b/dom/filesystem/GetFileOrDirectoryTask.cpp @@ -27,14 +27,13 @@ namespace dom { /* static */ already_AddRefed GetFileOrDirectoryTaskChild::Create(FileSystemBase* aFileSystem, nsIFile* aTargetPath, - bool aDirectoryOnly, ErrorResult& aRv) { MOZ_ASSERT(NS_IsMainThread(), "Only call on main thread!"); MOZ_ASSERT(aFileSystem); RefPtr task = - new GetFileOrDirectoryTaskChild(aFileSystem, aTargetPath, aDirectoryOnly); + new GetFileOrDirectoryTaskChild(aFileSystem, aTargetPath); // aTargetPath can be null. In this case SetError will be called. @@ -54,8 +53,7 @@ GetFileOrDirectoryTaskChild::Create(FileSystemBase* aFileSystem, } GetFileOrDirectoryTaskChild::GetFileOrDirectoryTaskChild(FileSystemBase* aFileSystem, - nsIFile* aTargetPath, - bool aDirectoryOnly) + nsIFile* aTargetPath) : FileSystemTaskChildBase(aFileSystem) , mTargetPath(aTargetPath) { diff --git a/dom/filesystem/GetFileOrDirectoryTask.h b/dom/filesystem/GetFileOrDirectoryTask.h index 2e8f1b08bef24..cda18de9063ef 100644 --- a/dom/filesystem/GetFileOrDirectoryTask.h +++ b/dom/filesystem/GetFileOrDirectoryTask.h @@ -23,7 +23,6 @@ class GetFileOrDirectoryTaskChild final : public FileSystemTaskChildBase static already_AddRefed Create(FileSystemBase* aFileSystem, nsIFile* aTargetPath, - bool aDirectoryOnly, ErrorResult& aRv); virtual @@ -47,10 +46,8 @@ class GetFileOrDirectoryTaskChild final : public FileSystemTaskChildBase HandlerCallback() override; private: - // If aDirectoryOnly is set, we should ensure that the target is a directory. GetFileOrDirectoryTaskChild(FileSystemBase* aFileSystem, - nsIFile* aTargetPath, - bool aDirectoryOnly); + nsIFile* aTargetPath); RefPtr mPromise; nsCOMPtr mTargetPath; diff --git a/dom/filesystem/PFileSystemParams.ipdlh b/dom/filesystem/PFileSystemParams.ipdlh index cc758fe4467b2..08929b6f2ed5e 100644 --- a/dom/filesystem/PFileSystemParams.ipdlh +++ b/dom/filesystem/PFileSystemParams.ipdlh @@ -7,12 +7,6 @@ include protocol PBlob; namespace mozilla { namespace dom { -union FileSystemFileDataValue -{ - uint8_t[]; - PBlob; -}; - struct FileSystemGetDirectoryListingParams { nsString filesystem; diff --git a/dom/filesystem/PFileSystemRequest.ipdl b/dom/filesystem/PFileSystemRequest.ipdl index 476052af4fc3c..49803a770302a 100644 --- a/dom/filesystem/PFileSystemRequest.ipdl +++ b/dom/filesystem/PFileSystemRequest.ipdl @@ -52,14 +52,8 @@ struct FileSystemErrorResponse nsresult error; }; -struct FileSystemBooleanResponse -{ - bool success; -}; - union FileSystemResponseValue { - FileSystemBooleanResponse; FileSystemDirectoryResponse; FileSystemDirectoryListingResponse; FileSystemFileResponse; diff --git a/dom/filesystem/compat/CallbackRunnables.cpp b/dom/filesystem/compat/CallbackRunnables.cpp index d09fac7bce6ce..7bfe43cef6bc5 100644 --- a/dom/filesystem/compat/CallbackRunnables.cpp +++ b/dom/filesystem/compat/CallbackRunnables.cpp @@ -155,7 +155,7 @@ GetEntryHelper::Run() } RefPtr task = - GetFileOrDirectoryTaskChild::Create(fs, realPath, false, rv); + GetFileOrDirectoryTaskChild::Create(fs, realPath, rv); if (NS_WARN_IF(rv.Failed())) { rv.SuppressException(); Error(NS_ERROR_DOM_INVALID_STATE_ERR);