Issue #80 - De-unify dom/base

Tag #1375

dom/base/BlobSet.h

@@ -8,6 +8,9 @@
 #define mozilla_dom_BlobSet_h
 
 #include "mozilla/RefPtr.h"
+#include "jsfriendapi.h"
+#include "nsString.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace dom {

dom/base/CORSMode.h

@@ -4,6 +4,8 @@
  * 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 <stdint.h>
+
 #ifndef CORSMode_h_
 #define CORSMode_h_
 

dom/base/ChromeUtils.cpp

@@ -7,6 +7,7 @@
 
 #include "mozilla/Base64.h"
 #include "mozilla/BasePrincipal.h"
+#include "jsfriendapi.h"
 
 namespace mozilla {
 namespace dom {

dom/base/ChromeUtils.h

@@ -10,6 +10,7 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ChromeUtilsBinding.h"
 #include "mozilla/dom/ThreadSafeChromeUtilsBinding.h"
+#include "mozilla/dom/UnionTypes.h"
 #include "mozilla/ErrorResult.h"
 
 namespace mozilla {

dom/base/CustomElementRegistry.cpp

@@ -11,6 +11,8 @@
 #include "mozilla/dom/HTMLElementBinding.h"
 #include "mozilla/dom/WebComponentsBinding.h"
 #include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Promise.h"
+#include "nsContentUtils.h"
 #include "nsHTMLTags.h"
 #include "jsapi.h"
 

dom/base/DocGroup.cpp

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/DocGroup.h"
 #include "mozilla/dom/TabGroup.h"
 #include "mozilla/Telemetry.h"
@@ -7,6 +11,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "nsIDocShell.h"
 #include "nsDOMMutationObserver.h"
+#include "nsNetCID.h"
 
 namespace mozilla {
 namespace dom {

dom/base/GroupedSHistory.h

@@ -7,6 +7,8 @@
 #ifndef GroupedSHistory_h
 #define GroupedSHistory_h
 
+#include "nsCOMArray.h"
+#include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_*
 #include "nsIFrameLoader.h"
 #include "nsIGroupedSHistory.h"
 #include "nsIPartialSHistory.h"

dom/base/ImageTracker.cpp

@@ -8,6 +8,8 @@
  * animating */
 
 #include "ImageTracker.h"
+#include "mozilla/Preferences.h"
+#include "nsAppRunner.h" // for XRE_IsContentProcess
 
 namespace mozilla {
 namespace dom {

dom/base/ImageTracker.h

@@ -10,6 +10,7 @@
 #ifndef mozilla_dom_ImageTracker
 #define mozilla_dom_ImageTracker
 
+#include "imgIRequest.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 

dom/base/MutableBlobStorage.h

@@ -7,6 +7,9 @@
 #ifndef mozilla_dom_MutableBlobStorage_h
 #define mozilla_dom_MutableBlobStorage_h
 
+#include "nsCycleCollectionParticipant.h"
+#include "nsThreadUtils.h"
+#include "nsProxyRelease.h"
 #include "mozilla/RefPtr.h"
 #include "prio.h"
 

dom/base/MutableBlobStreamListener.cpp

@@ -5,6 +5,7 @@
 
 #include "MutableBlobStreamListener.h"
 #include "MutableBlobStorage.h"
+#include "nsIInputStream.h"
 
 namespace mozilla {
 namespace dom {

dom/base/NodeInfo.cpp

@@ -15,6 +15,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Likely.h"
+#include "mozilla/Unused.h"
 
 #include "nsNodeInfoManager.h"
 #include "nsCOMPtr.h"

dom/base/Pose.h

@@ -8,6 +8,7 @@
 #define mozilla_dom_Pose_h
 
 #include "nsWrapperCache.h"
+#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {

dom/base/TabGroup.h

@@ -7,10 +7,12 @@
 #ifndef TabGroup_h
 #define TabGroup_h
 
+#include "nsIDocument.h"
 #include "nsISupports.h"
 #include "nsISupportsImpl.h"
 #include "nsIPrincipal.h"
 #include "nsTHashtable.h"
+#include "nsHashKeys.h"
 #include "nsString.h"
 
 #include "mozilla/RefPtr.h"

dom/base/ThirdPartyUtil.cpp

@@ -10,6 +10,7 @@
 #include "nsIChannel.h"
 #include "nsIServiceManager.h"
 #include "nsIHttpChannelInternal.h"
+#include "nsPIDOMWindow.h"
 #include "nsIDOMWindow.h"
 #include "nsILoadContext.h"
 #include "nsIPrincipal.h"

dom/base/TimeoutHandler.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TimeoutHandler.h"
+#include "nsJSUtils.h"
 
 namespace mozilla {
 namespace dom {

dom/base/TimeoutHandler.h

@@ -7,9 +7,11 @@
 #ifndef mozilla_dom_timeout_handler_h
 #define mozilla_dom_timeout_handler_h
 
+#include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_*
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsITimeoutHandler.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace dom {

dom/base/TimerClamping.h

@@ -7,6 +7,8 @@
 #ifndef TimerClamping_h___
 #define TimerClamping_h___
 
+#include <math.h>
+
 namespace mozilla {
 
 class TimerClamping

dom/base/moz.build

@@ -225,7 +225,7 @@ EXPORTS.mozilla.dom += [
     'WindowOrientationObserver.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AnonymousContent.cpp',
     'Attr.cpp',
     'BarProps.cpp',
@@ -376,7 +376,7 @@ UNIFIED_SOURCES += [
 ]
 
 if CONFIG['MOZ_WEBRTC']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsDOMDataChannel.cpp',
     ]
 

dom/base/nsDOMMutationObserver.cpp

@@ -7,6 +7,7 @@
 #include "nsDOMMutationObserver.h"
 
 #include "mozilla/AnimationTarget.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/OwningNonNull.h"
 
@@ -30,6 +31,9 @@ using mozilla::dom::TreeOrderComparator;
 using mozilla::dom::Animation;
 using mozilla::dom::Element;
 
+using namespace mozilla;
+using namespace mozilla::dom;
+
 AutoTArray<RefPtr<nsDOMMutationObserver>, 4>*
   nsDOMMutationObserver::sScheduledMutationObservers = nullptr;
 

dom/base/nsJSEnvironment.cpp

@@ -57,6 +57,7 @@
 #include "mozilla/dom/ErrorEvent.h"
 #include "nsAXPCNativeCallContext.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/Telemetry.h"
 
 #include "nsJSPrincipals.h"
 

dom/base/nsJSUtils.cpp

@@ -31,6 +31,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ScriptSettings.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 bool

layout/style/nsDOMCSSAttrDeclaration.h

@@ -35,6 +35,7 @@ public:
   NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) override;
 
   virtual nsINode* GetParentObject() override;
+  typedef mozilla::dom::DocGroup DocGroup;
   virtual DocGroup* GetDocGroup() const override;
 
   NS_IMETHOD SetPropertyValue(const nsCSSPropertyID aPropID,