summaryrefslogtreecommitdiffstats
path: root/netwerk
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-05-17 14:14:09 +0000
committerMoonchild <moonchild@palemoon.org>2020-05-17 14:14:09 +0000
commit16d66edc28e746766e2d4274f5f9dca7fe97091e (patch)
treec4311ea01fd1dcaa611880a9218a6bc6a2bb9a99 /netwerk
parent798f491abec3889c4ad4904a966a915238166a5c (diff)
downloadUXP-16d66edc28e746766e2d4274f5f9dca7fe97091e.tar
UXP-16d66edc28e746766e2d4274f5f9dca7fe97091e.tar.gz
UXP-16d66edc28e746766e2d4274f5f9dca7fe97091e.tar.lz
UXP-16d66edc28e746766e2d4274f5f9dca7fe97091e.tar.xz
UXP-16d66edc28e746766e2d4274f5f9dca7fe97091e.zip
Issue #80 - De-unify netwerk/cache2
Diffstat (limited to 'netwerk')
-rw-r--r--netwerk/cache2/CacheFile.h1
-rw-r--r--netwerk/cache2/CacheFileContextEvictor.cpp1
-rw-r--r--netwerk/cache2/CacheFileUtils.cpp1
-rw-r--r--netwerk/cache2/CacheHashUtils.cpp1
-rw-r--r--netwerk/cache2/CacheIOThread.cpp2
-rw-r--r--netwerk/cache2/moz.build8
6 files changed, 8 insertions, 6 deletions
diff --git a/netwerk/cache2/CacheFile.h b/netwerk/cache2/CacheFile.h
index 3c8f7e97d..6d9d433b6 100644
--- a/netwerk/cache2/CacheFile.h
+++ b/netwerk/cache2/CacheFile.h
@@ -10,6 +10,7 @@
#include "CacheFileMetadata.h"
#include "nsRefPtrHashtable.h"
#include "nsClassHashtable.h"
+#include "nsICacheEntry.h"
#include "mozilla/Mutex.h"
class nsIInputStream;
diff --git a/netwerk/cache2/CacheFileContextEvictor.cpp b/netwerk/cache2/CacheFileContextEvictor.cpp
index acf089b79..65feb4462 100644
--- a/netwerk/cache2/CacheFileContextEvictor.cpp
+++ b/netwerk/cache2/CacheFileContextEvictor.cpp
@@ -8,6 +8,7 @@
#include "CacheIndex.h"
#include "CacheIndexIterator.h"
#include "CacheFileUtils.h"
+#include "CacheObserver.h"
#include "nsIFile.h"
#include "LoadContextInfo.h"
#include "nsThreadUtils.h"
diff --git a/netwerk/cache2/CacheFileUtils.cpp b/netwerk/cache2/CacheFileUtils.cpp
index a090a9cb1..11dee4e99 100644
--- a/netwerk/cache2/CacheFileUtils.cpp
+++ b/netwerk/cache2/CacheFileUtils.cpp
@@ -5,6 +5,7 @@
#include "CacheIndex.h"
#include "CacheLog.h"
#include "CacheFileUtils.h"
+#include "CacheObserver.h"
#include "LoadContextInfo.h"
#include "mozilla/Tokenizer.h"
#include "nsCOMPtr.h"
diff --git a/netwerk/cache2/CacheHashUtils.cpp b/netwerk/cache2/CacheHashUtils.cpp
index 1f816e347..6783f0b86 100644
--- a/netwerk/cache2/CacheHashUtils.cpp
+++ b/netwerk/cache2/CacheHashUtils.cpp
@@ -6,6 +6,7 @@
#include "mozilla/BasePrincipal.h"
#include "plstr.h"
+#include "mozilla/SHA1.h"
namespace mozilla {
namespace net {
diff --git a/netwerk/cache2/CacheIOThread.cpp b/netwerk/cache2/CacheIOThread.cpp
index 2fbc0ccce..c686c0f8d 100644
--- a/netwerk/cache2/CacheIOThread.cpp
+++ b/netwerk/cache2/CacheIOThread.cpp
@@ -4,6 +4,8 @@
#include "CacheIOThread.h"
#include "CacheFileIOManager.h"
+#include "CacheObserver.h"
+#include "CacheLog.h"
#include "nsIRunnable.h"
#include "nsISupportsImpl.h"
diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build
index 4fc6db59d..ce30e85af 100644
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -21,7 +21,8 @@ EXPORTS += [
'CacheStorageService.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
+ 'AppCacheStorage.cpp',
'CacheEntry.cpp',
'CacheFile.cpp',
'CacheFileChunk.cpp',
@@ -43,11 +44,6 @@ UNIFIED_SOURCES += [
'OldWrappers.cpp',
]
-# AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h.
-SOURCES += [
- 'AppCacheStorage.cpp',
-]
-
LOCAL_INCLUDES += [
'/netwerk/base',
'/netwerk/cache',