From 2def229da3465b40a95636800f5e148e0c25d896 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 14:17:32 +0200 Subject: Issue #80 - De-unify dom/filesystem --- dom/filesystem/FileSystemBase.cpp | 1 + dom/filesystem/FileSystemRequestParent.cpp | 3 +++ dom/filesystem/FileSystemSecurity.cpp | 3 +++ dom/filesystem/FileSystemTaskBase.cpp | 2 ++ dom/filesystem/FileSystemUtils.cpp | 3 +++ dom/filesystem/FileSystemUtils.h | 2 ++ dom/filesystem/GetDirectoryListingTask.cpp | 3 +++ dom/filesystem/GetFileOrDirectoryTask.cpp | 3 +++ dom/filesystem/GetFilesHelper.cpp | 8 ++++++++ dom/filesystem/GetFilesHelper.h | 3 +++ dom/filesystem/GetFilesTask.cpp | 3 +++ dom/filesystem/moz.build | 2 +- 12 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dom/filesystem/FileSystemBase.cpp b/dom/filesystem/FileSystemBase.cpp index f44f4fbf1..b19e12738 100644 --- a/dom/filesystem/FileSystemBase.cpp +++ b/dom/filesystem/FileSystemBase.cpp @@ -7,6 +7,7 @@ #include "mozilla/dom/FileSystemBase.h" #include "nsCharSeparatedTokenizer.h" +#include "FileSystemUtils.h" #include "OSFileSystem.h" namespace mozilla { diff --git a/dom/filesystem/FileSystemRequestParent.cpp b/dom/filesystem/FileSystemRequestParent.cpp index 0b9d6c18a..95a316b96 100644 --- a/dom/filesystem/FileSystemRequestParent.cpp +++ b/dom/filesystem/FileSystemRequestParent.cpp @@ -9,12 +9,15 @@ #include "GetDirectoryListingTask.h" #include "GetFileOrDirectoryTask.h" +#include "GetFilesTask.h" +#include "OSFileSystem.h" #include "mozilla/AppProcessChecker.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/FileSystemBase.h" #include "mozilla/dom/FileSystemSecurity.h" #include "mozilla/ipc/BackgroundParent.h" +#include "mozilla/Preferences.h" #include "mozilla/Unused.h" #include "nsProxyRelease.h" diff --git a/dom/filesystem/FileSystemSecurity.cpp b/dom/filesystem/FileSystemSecurity.cpp index b3d425817..7c70374a0 100644 --- a/dom/filesystem/FileSystemSecurity.cpp +++ b/dom/filesystem/FileSystemSecurity.cpp @@ -8,6 +8,9 @@ #include "FileSystemUtils.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/StaticPtr.h" +#include "mozilla/ipc/BackgroundParent.h" + +using namespace mozilla::ipc; namespace mozilla { namespace dom { diff --git a/dom/filesystem/FileSystemTaskBase.cpp b/dom/filesystem/FileSystemTaskBase.cpp index 481002b7d..e9eed90ee 100644 --- a/dom/filesystem/FileSystemTaskBase.cpp +++ b/dom/filesystem/FileSystemTaskBase.cpp @@ -19,6 +19,8 @@ #include "mozilla/Unused.h" #include "nsProxyRelease.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/FileSystemUtils.cpp b/dom/filesystem/FileSystemUtils.cpp index 872e049ee..56293cbda 100644 --- a/dom/filesystem/FileSystemUtils.cpp +++ b/dom/filesystem/FileSystemUtils.cpp @@ -5,6 +5,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/dom/FileSystemUtils.h" +#include "nsCharSeparatedTokenizer.h" +#include "nsString.h" +#include "nsTArray.h" namespace mozilla { namespace dom { diff --git a/dom/filesystem/FileSystemUtils.h b/dom/filesystem/FileSystemUtils.h index ae302e07c..42fc5573c 100644 --- a/dom/filesystem/FileSystemUtils.h +++ b/dom/filesystem/FileSystemUtils.h @@ -7,6 +7,8 @@ #ifndef mozilla_dom_FileSystemUtils_h #define mozilla_dom_FileSystemUtils_h +#include "nsString.h" + class nsIFile; namespace mozilla { diff --git a/dom/filesystem/GetDirectoryListingTask.cpp b/dom/filesystem/GetDirectoryListingTask.cpp index e3ac2933f..999366fe8 100644 --- a/dom/filesystem/GetDirectoryListingTask.cpp +++ b/dom/filesystem/GetDirectoryListingTask.cpp @@ -16,10 +16,13 @@ #include "mozilla/dom/UnionTypes.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsIFile.h" #include "nsISimpleEnumerator.h" #include "nsStringGlue.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/GetFileOrDirectoryTask.cpp b/dom/filesystem/GetFileOrDirectoryTask.cpp index f71976503..446c641f4 100644 --- a/dom/filesystem/GetFileOrDirectoryTask.cpp +++ b/dom/filesystem/GetFileOrDirectoryTask.cpp @@ -14,9 +14,12 @@ #include "mozilla/dom/Promise.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsIFile.h" #include "nsStringGlue.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/GetFilesHelper.cpp b/dom/filesystem/GetFilesHelper.cpp index 21d228a60..c4cbe7f14 100644 --- a/dom/filesystem/GetFilesHelper.cpp +++ b/dom/filesystem/GetFilesHelper.cpp @@ -5,8 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GetFilesHelper.h" +#include "FileSystemUtils.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentParent.h" +#include "mozilla/dom/Directory.h" +#include "mozilla/dom/Promise.h" +#include "mozilla/dom/UnionTypes.h" +#include "mozilla/dom/ipc/BlobParent.h" +#include "nsContentUtils.h" +#include "nsNetCID.h" +#include "nsISimpleEnumerator.h" #include "nsProxyRelease.h" namespace mozilla { diff --git a/dom/filesystem/GetFilesHelper.h b/dom/filesystem/GetFilesHelper.h index a1bb1b27a..371c73ef2 100644 --- a/dom/filesystem/GetFilesHelper.h +++ b/dom/filesystem/GetFilesHelper.h @@ -9,9 +9,12 @@ #include "mozilla/Mutex.h" #include "mozilla/RefPtr.h" +#include "mozilla/dom/File.h" +#include "nsClassHashtable.h" #include "nsCycleCollectionTraversalCallback.h" #include "nsTArray.h" #include "nsTHashtable.h" +#include "nsThreadUtils.h" class nsIGlobalObject; diff --git a/dom/filesystem/GetFilesTask.cpp b/dom/filesystem/GetFilesTask.cpp index 6682fb7d3..b283eec54 100644 --- a/dom/filesystem/GetFilesTask.cpp +++ b/dom/filesystem/GetFilesTask.cpp @@ -15,9 +15,12 @@ #include "mozilla/dom/Promise.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsIFile.h" #include "nsStringGlue.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/moz.build b/dom/filesystem/moz.build index 6e516c3a7..1b6a8d3ca 100644 --- a/dom/filesystem/moz.build +++ b/dom/filesystem/moz.build @@ -19,7 +19,7 @@ EXPORTS.mozilla.dom += [ 'OSFileSystem.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Directory.cpp', 'FileSystemBase.cpp', 'FileSystemRequestParent.cpp', -- cgit v1.2.3