From 5ea9cced68ef4d1726f5a385cda285fe3205b144 Mon Sep 17 00:00:00 2001 From: Jonathan Watt Date: Thu, 26 Oct 2017 12:35:08 +0100 Subject: [PATCH] Bug 1417365 - Unified build issues in dom/cache. r=baku --- dom/cache/CacheOpChild.cpp | 1 + dom/cache/CacheOpParent.cpp | 1 + dom/cache/CacheStorage.cpp | 2 ++ dom/cache/CacheStreamControlChild.cpp | 2 ++ dom/cache/CacheStreamControlParent.cpp | 4 ++++ dom/cache/FileUtils.cpp | 4 +--- dom/cache/FileUtils.h | 7 ++++++- dom/cache/QuotaClient.cpp | 3 +++ dom/cache/QuotaClient.h | 1 + dom/cache/ReadStream.h | 3 ++- dom/cache/TypeUtils.cpp | 1 + 11 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dom/cache/CacheOpChild.cpp b/dom/cache/CacheOpChild.cpp index 91586460ea7d..3f020f6be8b2 100644 --- a/dom/cache/CacheOpChild.cpp +++ b/dom/cache/CacheOpChild.cpp @@ -12,6 +12,7 @@ #include "mozilla/dom/cache/Cache.h" #include "mozilla/dom/cache/CacheChild.h" #include "mozilla/dom/cache/CacheStreamControlChild.h" +#include "mozilla/dom/cache/CacheWorkerHolder.h" namespace mozilla { namespace dom { diff --git a/dom/cache/CacheOpParent.cpp b/dom/cache/CacheOpParent.cpp index f7eeb30caaf6..bc7a7947b075 100644 --- a/dom/cache/CacheOpParent.cpp +++ b/dom/cache/CacheOpParent.cpp @@ -12,6 +12,7 @@ #include "mozilla/dom/cache/SavedTypes.h" #include "mozilla/ipc/FileDescriptorSetParent.h" #include "mozilla/ipc/InputStreamUtils.h" +#include "mozilla/ipc/IPCStreamUtils.h" namespace mozilla { namespace dom { diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp index bc2ede67dded..b86a26cd7200 100644 --- a/dom/cache/CacheStorage.cpp +++ b/dom/cache/CacheStorage.cpp @@ -7,7 +7,9 @@ #include "mozilla/dom/cache/CacheStorage.h" #include "mozilla/Unused.h" +#include "mozilla/dom/CacheBinding.h" #include "mozilla/dom/CacheStorageBinding.h" +#include "mozilla/dom/InternalRequest.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/Response.h" #include "mozilla/dom/cache/AutoUtils.h" diff --git a/dom/cache/CacheStreamControlChild.cpp b/dom/cache/CacheStreamControlChild.cpp index 7205fe6aec3b..61efd6246d59 100644 --- a/dom/cache/CacheStreamControlChild.cpp +++ b/dom/cache/CacheStreamControlChild.cpp @@ -9,8 +9,10 @@ #include "mozilla/Unused.h" #include "mozilla/dom/cache/ActorUtils.h" #include "mozilla/dom/cache/CacheTypes.h" +#include "mozilla/dom/cache/CacheWorkerHolder.h" #include "mozilla/dom/cache/ReadStream.h" #include "mozilla/ipc/FileDescriptorSetChild.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/PBackgroundChild.h" #include "mozilla/ipc/PFileDescriptorSetChild.h" #include "nsISupportsImpl.h" diff --git a/dom/cache/CacheStreamControlParent.cpp b/dom/cache/CacheStreamControlParent.cpp index 60355a07a163..b7cb4d4a391b 100644 --- a/dom/cache/CacheStreamControlParent.cpp +++ b/dom/cache/CacheStreamControlParent.cpp @@ -6,20 +6,24 @@ #include "mozilla/dom/cache/CacheStreamControlParent.h" +#include "mozilla/UniquePtr.h" #include "mozilla/Unused.h" #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/dom/cache/ReadStream.h" #include "mozilla/dom/cache/StreamList.h" #include "mozilla/ipc/FileDescriptorSetParent.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/PBackgroundParent.h" #include "mozilla/ipc/PFileDescriptorSetParent.h" #include "nsISupportsImpl.h" +#include "nsTArray.h" namespace mozilla { namespace dom { namespace cache { using mozilla::dom::OptionalFileDescriptorSet; +using mozilla::ipc::AutoIPCStream; using mozilla::ipc::FileDescriptor; using mozilla::ipc::FileDescriptorSetParent; using mozilla::ipc::PFileDescriptorSetParent; diff --git a/dom/cache/FileUtils.cpp b/dom/cache/FileUtils.cpp index 4ff59e01f652..b10f27d6938c 100644 --- a/dom/cache/FileUtils.cpp +++ b/dom/cache/FileUtils.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/cache/FileUtils.h" +#include "DBSchema.h" #include "mozilla/dom/InternalResponse.h" #include "mozilla/dom/quota/FileStreams.h" #include "mozilla/dom/quota/QuotaManager.h" @@ -26,9 +27,6 @@ namespace mozilla { namespace dom { namespace cache { -#define PADDING_FILE_NAME ".padding" -#define PADDING_TMP_FILE_NAME ".padding-tmp" - using mozilla::dom::quota::FileInputStream; using mozilla::dom::quota::FileOutputStream; using mozilla::dom::quota::PERSISTENCE_TYPE_DEFAULT; diff --git a/dom/cache/FileUtils.h b/dom/cache/FileUtils.h index 867cebf17b69..27d93d1851c0 100644 --- a/dom/cache/FileUtils.h +++ b/dom/cache/FileUtils.h @@ -9,6 +9,7 @@ #include "mozilla/Attributes.h" #include "mozilla/dom/cache/Types.h" +#include "mozIStorageConnection.h" #include "nsStreamUtils.h" #include "nsTArrayForwardDeclare.h" @@ -19,6 +20,9 @@ namespace mozilla { namespace dom { namespace cache { +#define PADDING_FILE_NAME ".padding" +#define PADDING_TMP_FILE_NAME ".padding-tmp" + enum DirPaddingFile { FILE, @@ -55,7 +59,8 @@ BodyOpen(const QuotaInfo& aQuotaInfo, nsIFile* aBaseDir, const nsID& aId, nsresult BodyMaybeUpdatePaddingSize(const QuotaInfo& aQuotaInfo, nsIFile* aBaseDir, - const nsID& aId, int64_t* aPaddingSizeOut); + const nsID& aId, const uint32_t aPaddingInfo, + int64_t* aPaddingSizeOut); nsresult BodyDeleteFiles(const QuotaInfo& aQuotaInfo, nsIFile* aBaseDir, diff --git a/dom/cache/QuotaClient.cpp b/dom/cache/QuotaClient.cpp index 426176060315..bb66e246bbaa 100644 --- a/dom/cache/QuotaClient.cpp +++ b/dom/cache/QuotaClient.cpp @@ -6,10 +6,13 @@ #include "mozilla/dom/cache/QuotaClient.h" +#include "DBAction.h" +#include "FileUtils.h" #include "mozilla/dom/cache/Manager.h" #include "mozilla/dom/quota/QuotaManager.h" #include "mozilla/dom/quota/UsageInfo.h" #include "mozilla/ipc/BackgroundParent.h" +#include "mozilla/Unused.h" #include "nsIFile.h" #include "nsISimpleEnumerator.h" #include "nsThreadUtils.h" diff --git a/dom/cache/QuotaClient.h b/dom/cache/QuotaClient.h index b5e804fe17d0..ade3de49a54c 100644 --- a/dom/cache/QuotaClient.h +++ b/dom/cache/QuotaClient.h @@ -10,6 +10,7 @@ #include "mozilla/Attributes.h" #include "mozilla/dom/cache/Types.h" #include "mozilla/dom/quota/Client.h" +#include "mozIStorageConnection.h" namespace mozilla { namespace dom { diff --git a/dom/cache/ReadStream.h b/dom/cache/ReadStream.h index 76bca3fb8d92..a035bae7208f 100644 --- a/dom/cache/ReadStream.h +++ b/dom/cache/ReadStream.h @@ -7,12 +7,13 @@ #ifndef mozilla_dom_cache_ReadStream_h #define mozilla_dom_cache_ReadStream_h +#include "mozilla/ErrorResult.h" #include "mozilla/ipc/FileDescriptor.h" +#include "mozilla/RefPtr.h" #include "nsCOMPtr.h" #include "nsID.h" #include "nsIInputStream.h" #include "nsISupportsImpl.h" -#include "mozilla/RefPtr.h" #include "nsTArrayForwardDeclare.h" namespace mozilla { diff --git a/dom/cache/TypeUtils.cpp b/dom/cache/TypeUtils.cpp index a4ed78fa7019..35e60b2c37d8 100644 --- a/dom/cache/TypeUtils.cpp +++ b/dom/cache/TypeUtils.cpp @@ -14,6 +14,7 @@ #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/dom/cache/ReadStream.h" #include "mozilla/ipc/BackgroundChild.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/PBackgroundChild.h" #include "mozilla/ipc/PFileDescriptorSetChild.h" #include "mozilla/ipc/InputStreamUtils.h"