Issue #80 - De-unify dom/fetch

Running into the same problem as with dom/canvas: derived template
classes not being happy about being non-unified. Kept unified for now
to prevent linking errors.

8 files changed, 20 insertions, 5 deletions

diff --git a/dom/fetch/FetchConsumer.h b/dom/fetch/FetchConsumer.h
index a7509a0ae5..2b57253420 100644
--- a/dom/fetch/FetchConsumer.h
+++ b/dom/fetch/FetchConsumer.h
@@ -8,11 +8,13 @@
 #define mozilla_dom_FetchConsumer_h
 
 #include "Fetch.h"
+#include "nsIInputStream.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 #include "mozilla/dom/MutableBlobStorage.h"
 
 class nsIThread;
+class nsIInputStreamPump;
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/fetch/FetchUtil.cpp b/dom/fetch/FetchUtil.cpp
index 601d99216e..b384c4f810 100644
--- a/dom/fetch/FetchUtil.cpp
+++ b/dom/fetch/FetchUtil.cpp
@@ -2,6 +2,7 @@
 
 #include "nsError.h"
 #include "nsIUnicodeDecoder.h"
+#include "nsNetUtil.h"
 #include "nsString.h"
 
 #include "mozilla/dom/EncodingUtils.h"
diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp
index b2631da6a1..65f8095e28 100644
--- a/dom/fetch/InternalRequest.cpp
+++ b/dom/fetch/InternalRequest.cpp
@@ -8,6 +8,7 @@
 
 #include "nsIContentPolicy.h"
 #include "nsIDocument.h"
+#include "nsIHttpChannelInternal.h"
 #include "nsStreamUtils.h"
 
 #include "mozilla/ErrorResult.h"
diff --git a/dom/fetch/InternalResponse.cpp b/dom/fetch/InternalResponse.cpp
index cb7d745972..1b1ae13e3d 100644
--- a/dom/fetch/InternalResponse.cpp
+++ b/dom/fetch/InternalResponse.cpp
@@ -7,6 +7,7 @@
 #include "InternalResponse.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/dom/FetchTypes.h"
 #include "mozilla/dom/InternalHeaders.h"
 #include "mozilla/dom/cache/CacheTypes.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
diff --git a/dom/fetch/InternalResponse.h b/dom/fetch/InternalResponse.h
index 35467836a0..0801e32506 100644
--- a/dom/fetch/InternalResponse.h
+++ b/dom/fetch/InternalResponse.h
@@ -12,6 +12,7 @@
 
 #include "mozilla/dom/ResponseBinding.h"
 #include "mozilla/dom/ChannelInfo.h"
+#include "mozilla/dom/InternalHeaders.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla {
diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp
index 7ca5b43c4f..6a7885b1aa 100644
--- a/dom/fetch/Request.cpp
+++ b/dom/fetch/Request.cpp
@@ -7,6 +7,7 @@
 #include "Request.h"
 
 #include "nsIURI.h"
+#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 
 #include "mozilla/ErrorResult.h"
@@ -15,14 +16,18 @@
 #include "mozilla/dom/FetchUtil.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/URL.h"
-#include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/Unused.h"
 
 #include "WorkerPrivate.h"
+#include "WorkerRunnable.h"
+#include "WorkerScope.h"
+#include "Workers.h"
 
 namespace mozilla {
 namespace dom {
 
+using namespace workers;
+
 NS_IMPL_CYCLE_COLLECTING_ADDREF(Request)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(Request)
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Request, mOwner, mHeaders)
@@ -237,14 +242,14 @@ GetRequestURLFromWorker(const GlobalObject& aGlobal, const nsAString& aInput,
   }
 }
 
-class ReferrerSameOriginChecker final : public workers::WorkerMainThreadRunnable
+class ReferrerSameOriginChecker final : public WorkerMainThreadRunnable
 {
 public:
   ReferrerSameOriginChecker(workers::WorkerPrivate* aWorkerPrivate,
                             const nsAString& aReferrerURL,
                             nsresult& aResult)
-    : workers::WorkerMainThreadRunnable(aWorkerPrivate,
-                                        NS_LITERAL_CSTRING("Fetch :: Referrer same origin check")),
+    : WorkerMainThreadRunnable(aWorkerPrivate,
+                               NS_LITERAL_CSTRING("Fetch :: Referrer same origin check")),
       mReferrerURL(aReferrerURL),
       mResult(aResult)
   {
diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp
index 3b3ada6d31..e35de0e12d 100644
--- a/dom/fetch/Response.cpp
+++ b/dom/fetch/Response.cpp
@@ -8,6 +8,7 @@
 
 #include "nsISupportsImpl.h"
 #include "nsIURI.h"
+#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 
 #include "mozilla/ErrorResult.h"
diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build
index fb2279fe7c..f93487e092 100644
--- a/dom/fetch/moz.build
+++ b/dom/fetch/moz.build
@@ -19,9 +19,12 @@ EXPORTS.mozilla.dom += [
 ]
 
 UNIFIED_SOURCES += [
-    'ChannelInfo.cpp',
     'Fetch.cpp',
     'FetchConsumer.cpp',
+]
+
+SOURCES += [
+    'ChannelInfo.cpp',
     'FetchDriver.cpp',
     'FetchUtil.cpp',
     'Headers.cpp',