From 8f9e4e8061202b125a1253620d4f664e51c29cf0 Mon Sep 17 00:00:00 2001
From: Subhamoy Sengupta <ssengupta@mozilla.com>
Date: Wed, 25 Mar 2020 12:45:59 +0000
Subject: [PATCH] Bug 1624588 - dom/file/ipc sources now also build when not
 unified r=baku

Missing includes, namespace-related issues, and missing template instantiations added to make sources compile without unifying.

Differential Revision: https://phabricator.services.mozilla.com/D68142

--HG--
extra : moz-landing-system : lando
---
 dom/cache/CacheStreamControlChild.cpp      |  2 +-
 dom/file/ipc/IPCBlobInputStream.cpp        |  2 ++
 dom/file/ipc/IPCBlobInputStreamChild.h     |  1 +
 dom/file/ipc/IPCBlobInputStreamParent.cpp  | 10 ++++++++++
 dom/file/ipc/IPCBlobInputStreamStorage.cpp |  2 +-
 dom/file/ipc/IPCBlobInputStreamThread.h    |  2 ++
 dom/file/ipc/TemporaryIPCBlobChild.cpp     |  1 +
 dom/file/ipc/TemporaryIPCBlobParent.cpp    |  3 ++-
 8 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dom/cache/CacheStreamControlChild.cpp b/dom/cache/CacheStreamControlChild.cpp
index 6c2f84521692..516f7b03451d 100644
--- a/dom/cache/CacheStreamControlChild.cpp
+++ b/dom/cache/CacheStreamControlChild.cpp
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/cache/CacheStreamControlChild.h"
+#include "CacheStreamControlChild.h"
 
 #include "mozilla/Unused.h"
 #include "mozilla/dom/cache/ActorUtils.h"
diff --git a/dom/file/ipc/IPCBlobInputStream.cpp b/dom/file/ipc/IPCBlobInputStream.cpp
index 2b2042926e8e..384c2660298f 100644
--- a/dom/file/ipc/IPCBlobInputStream.cpp
+++ b/dom/file/ipc/IPCBlobInputStream.cpp
@@ -21,6 +21,8 @@
 namespace mozilla {
 namespace dom {
 
+class IPCBlobInputStream;
+
 namespace {
 
 class InputStreamCallbackRunnable final : public CancelableRunnable {
diff --git a/dom/file/ipc/IPCBlobInputStreamChild.h b/dom/file/ipc/IPCBlobInputStreamChild.h
index 8a6a1b5ca872..27d7c31f81e2 100644
--- a/dom/file/ipc/IPCBlobInputStreamChild.h
+++ b/dom/file/ipc/IPCBlobInputStreamChild.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_IPCBlobInputStreamChild_h
 
 #include "mozilla/dom/PIPCBlobInputStreamChild.h"
+#include "mozilla/dom/IPCBlobInputStream.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/UniquePtr.h"
 #include "nsTArray.h"
diff --git a/dom/file/ipc/IPCBlobInputStreamParent.cpp b/dom/file/ipc/IPCBlobInputStreamParent.cpp
index 73431e054b98..31231a4f6116 100644
--- a/dom/file/ipc/IPCBlobInputStreamParent.cpp
+++ b/dom/file/ipc/IPCBlobInputStreamParent.cpp
@@ -46,6 +46,16 @@ already_AddRefed<IPCBlobInputStreamParent> IPCBlobInputStreamParent::Create(
   return actor.forget();
 }
 
+template already_AddRefed<IPCBlobInputStreamParent>
+IPCBlobInputStreamParent::Create<mozilla::ipc::PBackgroundParent>(
+    nsIInputStream*, unsigned long, unsigned long, nsresult*,
+    mozilla::ipc::PBackgroundParent*);
+
+template already_AddRefed<IPCBlobInputStreamParent>
+IPCBlobInputStreamParent::Create<ContentParent>(nsIInputStream*, unsigned long,
+                                                unsigned long, nsresult*,
+                                                ContentParent*);
+
 IPCBlobInputStreamParent::IPCBlobInputStreamParent(const nsID& aID,
                                                    uint64_t aSize,
                                                    ContentParent* aManager)
diff --git a/dom/file/ipc/IPCBlobInputStreamStorage.cpp b/dom/file/ipc/IPCBlobInputStreamStorage.cpp
index d3c1e4ddafc7..1e0299ab61e2 100644
--- a/dom/file/ipc/IPCBlobInputStreamStorage.cpp
+++ b/dom/file/ipc/IPCBlobInputStreamStorage.cpp
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IPCBlobInputStreamStorage.h"
-
+#include "mozilla/SlicedInputStream.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
diff --git a/dom/file/ipc/IPCBlobInputStreamThread.h b/dom/file/ipc/IPCBlobInputStreamThread.h
index e94f4d9b3a1a..e40f30d25b87 100644
--- a/dom/file/ipc/IPCBlobInputStreamThread.h
+++ b/dom/file/ipc/IPCBlobInputStreamThread.h
@@ -7,8 +7,10 @@
 #ifndef mozilla_dom_IPCBlobInputStreamThread_h
 #define mozilla_dom_IPCBlobInputStreamThread_h
 
+#include "mozilla/dom/IPCBlobInputStreamChild.h"
 #include "nsIEventTarget.h"
 #include "nsIObserver.h"
+#include "nsTArray.h"
 
 class nsIThread;
 
diff --git a/dom/file/ipc/TemporaryIPCBlobChild.cpp b/dom/file/ipc/TemporaryIPCBlobChild.cpp
index 0f4eed84ad85..4b24a80385fe 100644
--- a/dom/file/ipc/TemporaryIPCBlobChild.cpp
+++ b/dom/file/ipc/TemporaryIPCBlobChild.cpp
@@ -6,6 +6,7 @@
 
 #include "TemporaryIPCBlobChild.h"
 #include "mozilla/dom/MutableBlobStorage.h"
+#include "mozilla/dom/IPCBlobUtils.h"
 #include <private/pprio.h>
 
 namespace mozilla {
diff --git a/dom/file/ipc/TemporaryIPCBlobParent.cpp b/dom/file/ipc/TemporaryIPCBlobParent.cpp
index f5d3e7903983..a29861fd3ef2 100644
--- a/dom/file/ipc/TemporaryIPCBlobParent.cpp
+++ b/dom/file/ipc/TemporaryIPCBlobParent.cpp
@@ -4,11 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "private/pprio.h"
 #include "TemporaryIPCBlobParent.h"
-
 #include "mozilla/dom/FileBlobImpl.h"
 #include "nsAnonymousTemporaryFile.h"
 #include "TemporaryFileBlobImpl.h"
+#include "mozilla/dom/IPCBlobUtils.h"
 
 namespace mozilla {
 namespace dom {