From 4e225fc7d17ebde37f1396feee2754f1cfa9dd60 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 23 Apr 2020 16:19:06 +0000 Subject: Issue #80 - De-unify dom/workers --- dom/workers/ServiceWorkerCommon.h | 2 ++ dom/workers/ServiceWorkerEvents.cpp | 2 ++ dom/workers/ServiceWorkerInfo.cpp | 2 ++ dom/workers/ServiceWorkerInfo.h | 1 + dom/workers/ServiceWorkerJob.cpp | 1 + dom/workers/ServiceWorkerRegisterJob.cpp | 1 + dom/workers/ServiceWorkerRegistrationInfo.cpp | 4 ++++ dom/workers/ServiceWorkerRegistrationInfo.h | 1 + dom/workers/ServiceWorkerUnregisterJob.cpp | 4 ++++ dom/workers/ServiceWorkerUpdateJob.cpp | 4 ++++ dom/workers/ServiceWorkerUpdateJob.h | 2 ++ dom/workers/ServiceWorkerWindowClient.cpp | 3 +++ dom/workers/SharedWorker.cpp | 1 + dom/workers/WorkerRunnable.cpp | 2 ++ dom/workers/WorkerRunnable.h | 1 + dom/workers/moz.build | 3 ++- 16 files changed, 33 insertions(+), 1 deletion(-) (limited to 'dom') diff --git a/dom/workers/ServiceWorkerCommon.h b/dom/workers/ServiceWorkerCommon.h index 1c272c125..d7e2ec21b 100644 --- a/dom/workers/ServiceWorkerCommon.h +++ b/dom/workers/ServiceWorkerCommon.h @@ -7,6 +7,8 @@ #ifndef mozilla_dom_ServiceWorkerCommon_h #define mozilla_dom_ServiceWorkerCommon_h +#include "mozilla/TypedEnumBits.h" + namespace mozilla { namespace dom { diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEvents.cpp index 8b375c635..a8b69bc48 100644 --- a/dom/workers/ServiceWorkerEvents.cpp +++ b/dom/workers/ServiceWorkerEvents.cpp @@ -28,6 +28,7 @@ #include "ServiceWorkerManager.h" #include "mozilla/ErrorResult.h" +#include "mozilla/Move.h" #include "mozilla/Preferences.h" #include "mozilla/dom/BodyUtil.h" #include "mozilla/dom/DOMException.h" @@ -50,6 +51,7 @@ #include "WorkerPrivate.h" #include "xpcpublic.h" +using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::dom::workers; diff --git a/dom/workers/ServiceWorkerInfo.cpp b/dom/workers/ServiceWorkerInfo.cpp index fa08b97a6..04fba7f8e 100644 --- a/dom/workers/ServiceWorkerInfo.cpp +++ b/dom/workers/ServiceWorkerInfo.cpp @@ -6,6 +6,8 @@ #include "ServiceWorkerInfo.h" +#include "ServiceWorker.h" +#include "ServiceWorkerPrivate.h" #include "ServiceWorkerScriptCache.h" BEGIN_WORKERS_NAMESPACE diff --git a/dom/workers/ServiceWorkerInfo.h b/dom/workers/ServiceWorkerInfo.h index 80910bdad..8c3220c1a 100644 --- a/dom/workers/ServiceWorkerInfo.h +++ b/dom/workers/ServiceWorkerInfo.h @@ -9,6 +9,7 @@ #include "mozilla/dom/ServiceWorkerBinding.h" // For ServiceWorkerState #include "nsIServiceWorkerManager.h" +#include "Workers.h" namespace mozilla { namespace dom { diff --git a/dom/workers/ServiceWorkerJob.cpp b/dom/workers/ServiceWorkerJob.cpp index 3d0a8e2cd..d80dddfb6 100644 --- a/dom/workers/ServiceWorkerJob.cpp +++ b/dom/workers/ServiceWorkerJob.cpp @@ -9,6 +9,7 @@ #include "nsProxyRelease.h" #include "nsThreadUtils.h" #include "Workers.h" +#include "ServiceWorkerManager.h" namespace mozilla { namespace dom { diff --git a/dom/workers/ServiceWorkerRegisterJob.cpp b/dom/workers/ServiceWorkerRegisterJob.cpp index 8f771e762..595c029e1 100644 --- a/dom/workers/ServiceWorkerRegisterJob.cpp +++ b/dom/workers/ServiceWorkerRegisterJob.cpp @@ -6,6 +6,7 @@ #include "ServiceWorkerRegisterJob.h" +#include "ServiceWorkerManager.h" #include "Workers.h" namespace mozilla { diff --git a/dom/workers/ServiceWorkerRegistrationInfo.cpp b/dom/workers/ServiceWorkerRegistrationInfo.cpp index 26ad74bda..28d9fa9de 100644 --- a/dom/workers/ServiceWorkerRegistrationInfo.cpp +++ b/dom/workers/ServiceWorkerRegistrationInfo.cpp @@ -6,6 +6,10 @@ #include "ServiceWorkerRegistrationInfo.h" +#include "ServiceWorkerManager.h" +#include "ServiceWorkerPrivate.h" +#include "nsProxyRelease.h" + BEGIN_WORKERS_NAMESPACE namespace { diff --git a/dom/workers/ServiceWorkerRegistrationInfo.h b/dom/workers/ServiceWorkerRegistrationInfo.h index d2d217be0..a7175ef58 100644 --- a/dom/workers/ServiceWorkerRegistrationInfo.h +++ b/dom/workers/ServiceWorkerRegistrationInfo.h @@ -8,6 +8,7 @@ #define mozilla_dom_workers_serviceworkerregistrationinfo_h #include "mozilla/dom/workers/ServiceWorkerInfo.h" +#include "mozilla/dom/workers/ServiceWorkerCommon.h" namespace mozilla { namespace dom { diff --git a/dom/workers/ServiceWorkerUnregisterJob.cpp b/dom/workers/ServiceWorkerUnregisterJob.cpp index 8fd76b63d..9fd377700 100644 --- a/dom/workers/ServiceWorkerUnregisterJob.cpp +++ b/dom/workers/ServiceWorkerUnregisterJob.cpp @@ -7,6 +7,10 @@ #include "ServiceWorkerUnregisterJob.h" #include "nsIPushService.h" +#include "nsServiceManagerUtils.h" +#include "mozilla/Unused.h" +#include "Workers.h" +#include "ServiceWorkerManager.h" namespace mozilla { namespace dom { diff --git a/dom/workers/ServiceWorkerUpdateJob.cpp b/dom/workers/ServiceWorkerUpdateJob.cpp index 69877dfe4..38f58a3f9 100644 --- a/dom/workers/ServiceWorkerUpdateJob.cpp +++ b/dom/workers/ServiceWorkerUpdateJob.cpp @@ -6,9 +6,13 @@ #include "ServiceWorkerUpdateJob.h" +#include "nsProxyRelease.h" #include "nsIScriptError.h" #include "nsIURL.h" +#include "nsNetUtil.h" #include "ServiceWorkerScriptCache.h" +#include "ServiceWorkerPrivate.h" +#include "ServiceWorkerManager.h" #include "Workers.h" namespace mozilla { diff --git a/dom/workers/ServiceWorkerUpdateJob.h b/dom/workers/ServiceWorkerUpdateJob.h index 77adb2212..e5bfdc81d 100644 --- a/dom/workers/ServiceWorkerUpdateJob.h +++ b/dom/workers/ServiceWorkerUpdateJob.h @@ -8,6 +8,8 @@ #define mozilla_dom_workers_serviceworkerupdatejob_h #include "ServiceWorkerJob.h" +#include "ServiceWorkerRegistrationInfo.h" +#include "nsILoadGroup.h" namespace mozilla { namespace dom { diff --git a/dom/workers/ServiceWorkerWindowClient.cpp b/dom/workers/ServiceWorkerWindowClient.cpp index bae747214..bf22a7b28 100644 --- a/dom/workers/ServiceWorkerWindowClient.cpp +++ b/dom/workers/ServiceWorkerWindowClient.cpp @@ -19,16 +19,19 @@ #include "nsIDocShellLoadInfo.h" #include "nsIDocument.h" #include "nsIGlobalObject.h" +#include "nsIInterfaceRequestor.h" #include "nsIPrincipal.h" #include "nsIScriptSecurityManager.h" #include "nsIWebNavigation.h" #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" +#include "nsNetUtil.h" #include "nsString.h" #include "nsWeakReference.h" #include "ServiceWorker.h" #include "ServiceWorkerInfo.h" #include "ServiceWorkerManager.h" +#include "ServiceWorkerPrivate.h" #include "WorkerPrivate.h" #include "WorkerScope.h" diff --git a/dom/workers/SharedWorker.cpp b/dom/workers/SharedWorker.cpp index 99bb50339..a9192e626 100644 --- a/dom/workers/SharedWorker.cpp +++ b/dom/workers/SharedWorker.cpp @@ -8,6 +8,7 @@ #include "nsPIDOMWindow.h" +#include "mozilla/dom/Event.h" #include "mozilla/EventDispatcher.h" #include "mozilla/Preferences.h" #include "mozilla/dom/MessagePort.h" diff --git a/dom/workers/WorkerRunnable.cpp b/dom/workers/WorkerRunnable.cpp index 60d69d4e4..8944c751c 100644 --- a/dom/workers/WorkerRunnable.cpp +++ b/dom/workers/WorkerRunnable.cpp @@ -14,6 +14,7 @@ #include "mozilla/DebugOnly.h" #include "mozilla/ErrorResult.h" +#include "mozilla/Unused.h" #include "mozilla/dom/ScriptSettings.h" #include "js/RootingAPI.h" @@ -22,6 +23,7 @@ #include "WorkerPrivate.h" #include "WorkerScope.h" +using namespace mozilla; USING_WORKERS_NAMESPACE namespace { diff --git a/dom/workers/WorkerRunnable.h b/dom/workers/WorkerRunnable.h index 8249a8053..2c9fb3b1d 100644 --- a/dom/workers/WorkerRunnable.h +++ b/dom/workers/WorkerRunnable.h @@ -14,6 +14,7 @@ #include "mozilla/Atomics.h" #include "nsISupportsImpl.h" #include "nsThreadUtils.h" /* nsRunnable */ +#include "WorkerHolder.h" struct JSContext; class nsIEventTarget; diff --git a/dom/workers/moz.build b/dom/workers/moz.build index 9fea84193..0ba7d9ad6 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -22,6 +22,7 @@ EXPORTS.mozilla.dom += [ EXPORTS.mozilla.dom.workers += [ 'RuntimeService.h', + 'ServiceWorkerCommon.h', 'ServiceWorkerInfo.h', 'ServiceWorkerManager.h', 'ServiceWorkerRegistrationInfo.h', @@ -46,7 +47,7 @@ XPIDL_SOURCES += [ 'nsIWorkerDebuggerManager.idl', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ChromeWorkerScope.cpp', 'FileReaderSync.cpp', 'Principal.cpp', -- cgit v1.2.3