diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-18 17:39:59 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-24 10:32:24 +0200 |
| commit | dc687dbc0b43bcff9566b135f95d54b28e68bde9 (patch) | |
| tree | 996ffc6f54bca79618ac2f884f893574b5c36992 | |
| parent | 216aa2cada27891edec0dae49f5190a69bcdb039 (diff) | |
| download | UXP-dc687dbc0b43bcff9566b135f95d54b28e68bde9.tar UXP-dc687dbc0b43bcff9566b135f95d54b28e68bde9.tar.gz UXP-dc687dbc0b43bcff9566b135f95d54b28e68bde9.tar.lz UXP-dc687dbc0b43bcff9566b135f95d54b28e68bde9.tar.xz UXP-dc687dbc0b43bcff9566b135f95d54b28e68bde9.zip | |
Issue #80 - De-unify dom/cache
| -rw-r--r-- | dom/cache/CacheOpParent.cpp | 1 | ||||
| -rw-r--r-- | dom/cache/CacheStorage.cpp | 3 | ||||
| -rw-r--r-- | dom/cache/CacheStreamControlChild.cpp | 1 | ||||
| -rw-r--r-- | dom/cache/CacheStreamControlParent.cpp | 2 | ||||
| -rw-r--r-- | dom/cache/ReadStream.h | 3 | ||||
| -rw-r--r-- | dom/cache/TypeUtils.cpp | 1 | ||||
| -rw-r--r-- | dom/cache/moz.build | 2 |
7 files changed, 12 insertions, 1 deletions
diff --git a/dom/cache/CacheOpParent.cpp b/dom/cache/CacheOpParent.cpp index 992ee82a7..37fcbc0f3 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" #include "mozilla/ipc/SendStream.h" namespace mozilla { diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp index 937e3826f..a0f486445 100644 --- a/dom/cache/CacheStorage.cpp +++ b/dom/cache/CacheStorage.cpp @@ -7,6 +7,7 @@ #include "mozilla/dom/cache/CacheStorage.h" #include "mozilla/Unused.h" +#include "mozilla/dom/CacheBinding.h" #include "mozilla/dom/CacheStorageBinding.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/Response.h" @@ -29,6 +30,8 @@ #include "nsURLParsers.h" #include "WorkerPrivate.h" +using namespace mozilla::dom; + namespace mozilla { namespace dom { namespace cache { diff --git a/dom/cache/CacheStreamControlChild.cpp b/dom/cache/CacheStreamControlChild.cpp index b7ca3a0e7..978019ab6 100644 --- a/dom/cache/CacheStreamControlChild.cpp +++ b/dom/cache/CacheStreamControlChild.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/cache/CacheTypes.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 54eef01d8..02f2fd2d3 100644 --- a/dom/cache/CacheStreamControlParent.cpp +++ b/dom/cache/CacheStreamControlParent.cpp @@ -11,6 +11,7 @@ #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" @@ -20,6 +21,7 @@ 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/ReadStream.h b/dom/cache/ReadStream.h index 824cedb02..6744f30c2 100644 --- a/dom/cache/ReadStream.h +++ b/dom/cache/ReadStream.h @@ -12,9 +12,12 @@ #include "nsID.h" #include "nsIInputStream.h" #include "nsISupportsImpl.h" +#include "mozilla/ErrorResult.h" #include "mozilla/RefPtr.h" #include "nsTArrayForwardDeclare.h" +using namespace mozilla; + namespace mozilla { namespace ipc { class AutoIPCStream; diff --git a/dom/cache/TypeUtils.cpp b/dom/cache/TypeUtils.cpp index 2d4cb30eb..f8c5cd7be 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" diff --git a/dom/cache/moz.build b/dom/cache/moz.build index 66f9f30fd..a536e5d75 100644 --- a/dom/cache/moz.build +++ b/dom/cache/moz.build @@ -38,7 +38,7 @@ EXPORTS.mozilla.dom.cache += [ 'TypeUtils.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Action.cpp', 'ActorChild.cpp', 'AutoUtils.cpp', |