Issue #80 - De-unify dom/workers

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 {
 

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;
 

dom/workers/ServiceWorkerInfo.cpp

@@ -6,6 +6,8 @@
 
 #include "ServiceWorkerInfo.h"
 
+#include "ServiceWorker.h"
+#include "ServiceWorkerPrivate.h"
 #include "ServiceWorkerScriptCache.h"
 
 BEGIN_WORKERS_NAMESPACE

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 {

dom/workers/ServiceWorkerJob.cpp

@@ -9,6 +9,7 @@
 #include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 #include "Workers.h"
+#include "ServiceWorkerManager.h"
 
 namespace mozilla {
 namespace dom {

dom/workers/ServiceWorkerRegisterJob.cpp

@@ -6,6 +6,7 @@
 
 #include "ServiceWorkerRegisterJob.h"
 
+#include "ServiceWorkerManager.h"
 #include "Workers.h"
 
 namespace mozilla {

dom/workers/ServiceWorkerRegistrationInfo.cpp

@@ -6,6 +6,10 @@
 
 #include "ServiceWorkerRegistrationInfo.h"
 
+#include "ServiceWorkerManager.h"
+#include "ServiceWorkerPrivate.h"
+#include "nsProxyRelease.h"
+
 BEGIN_WORKERS_NAMESPACE
 
 namespace {

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 {

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 {

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 {

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 {

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"
 

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"

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 {

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;

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',