From c55433ee037b2e32ac259a4484e92a2aff81062d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 16:45:01 +0200 Subject: 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. --- dom/fetch/Request.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'dom/fetch/Request.cpp') diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp index 7ca5b43c4..6a7885b1a 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) { -- cgit v1.2.3