Issue %2 - De-unify sources in /dom

This excludes a few known problematic parts.
Also excludes gtests because it'd be irrelevant to put the time in.

4 files changed, 12 insertions, 22 deletions

diff --git a/dom/base/moz.build b/dom/base/moz.build
index 167da6970..0da24bab8 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -240,6 +240,7 @@ SOURCES += [
     'DOMError.cpp',
     'DOMException.cpp',
     'DOMImplementation.cpp',
+    'DOMIntersectionObserver.cpp',
     'DOMMatrix.cpp',
     'DOMParser.cpp',
     'DOMPoint.cpp',
@@ -279,6 +280,7 @@ SOURCES += [
     'nsContentPermissionHelper.cpp',
     'nsContentPolicy.cpp',
     'nsContentSink.cpp',
+    'nsContentUtils.cpp',
     'nsCopySupport.cpp',
     'nsDataDocumentContentPolicy.cpp',
     'nsDocument.cpp',
@@ -291,17 +293,21 @@ SOURCES += [
     'nsDOMSerializer.cpp',
     'nsDOMTokenList.cpp',
     'nsDOMWindowList.cpp',
+    'nsDOMWindowUtils.cpp',
     'nsFocusManager.cpp',
     'nsFrameLoader.cpp',
+    'nsFrameMessageManager.cpp',
     'nsGenConImageContent.cpp',
     'nsGenericDOMDataNode.cpp',
     'nsGkAtoms.cpp',
+    'nsGlobalWindow.cpp',
     'nsGlobalWindowCommands.cpp',
     'nsHistory.cpp',
     'nsHostObjectProtocolHandler.cpp',
     'nsHostObjectURI.cpp',
     'nsHTMLContentSerializer.cpp',
     'nsIGlobalObject.cpp',
+    'nsImageLoadingContent.cpp',
     'nsINode.cpp',
     'nsInProcessTabChildGlobal.cpp',
     'nsJSEnvironment.cpp',
@@ -315,8 +321,10 @@ SOURCES += [
     'nsNoDataProtocolContentPolicy.cpp',
     'nsNodeInfoManager.cpp',
     'nsNodeUtils.cpp',
+    'nsObjectLoadingContent.cpp',
     'nsOpenURIInFrameParams.cpp',
     'nsPlainTextSerializer.cpp',
+    'nsPluginArray.cpp',
     'nsPropertyTable.cpp',
     'nsQueryContentEventResult.cpp',
     'nsRange.cpp',
@@ -368,26 +376,6 @@ SOURCES += [
     'WindowOrientationObserver.cpp',
 ]
 
-# these files couldn't be in UNIFIED_SOURCES for now for reasons given below:
-SOURCES += [
-    # Several conflicts with other bindings.
-    'DOMIntersectionObserver.cpp',
-    # Because of OS X headers.
-    'nsContentUtils.cpp',
-    # this file doesn't like windows.h
-    'nsDOMWindowUtils.cpp',
-    # Conflicts with windows.h's definition of SendMessage.
-    'nsFrameMessageManager.cpp',
-    # This file has a #error "Never include windows.h in this file!"
-    'nsGlobalWindow.cpp',
-    # Conflicts with windows.h's definition of LoadImage.
-    'nsImageLoadingContent.cpp',
-    # Because of OS X headers.
-    'nsObjectLoadingContent.cpp',
-    # nsPluginArray.cpp includes npapi.h indirectly, and that includes a lot of system headers
-    'nsPluginArray.cpp',
-]
-
 # Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
 # nsTextFragment.cpp
 if CONFIG['INTEL_ARCHITECTURE']:
diff --git a/dom/commandhandler/moz.build b/dom/commandhandler/moz.build
index ea862808d..fcee2deeb 100644
--- a/dom/commandhandler/moz.build
+++ b/dom/commandhandler/moz.build
@@ -14,7 +14,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'commandhandler'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
diff --git a/dom/media/webaudio/blink/IIRFilter.h b/dom/media/webaudio/blink/IIRFilter.h
index 5656d959a..f8ecdb3b2 100644
--- a/dom/media/webaudio/blink/IIRFilter.h
+++ b/dom/media/webaudio/blink/IIRFilter.h
@@ -5,6 +5,8 @@
 #ifndef IIRFilter_h
 #define IIRFilter_h
 
+#include "nsTArray.h"
+
 typedef nsTArray<double> AudioDoubleArray;
 
 namespace blink {
diff --git a/dom/media/webaudio/blink/moz.build b/dom/media/webaudio/blink/moz.build
index 99067248d..6afe93c91 100644
--- a/dom/media/webaudio/blink/moz.build
+++ b/dom/media/webaudio/blink/moz.build
@@ -3,7 +3,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'Biquad.cpp',
     'DynamicsCompressor.cpp',
     'DynamicsCompressorKernel.cpp',