De-unify build/ inspector/ ipc/ tools/layout-debug/src/ in layout/.

layout/build/moz.build

@@ -10,7 +10,7 @@ EXPORTS += [
     'nsLayoutStatics.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsContentDLF.cpp',
     'nsLayoutModule.cpp',
     'nsLayoutStatics.cpp',

layout/build/nsLayoutStatics.cpp

@@ -112,11 +112,13 @@
 #include "nsApplicationCacheService.h"
 #include "mozilla/dom/CustomElementRegistry.h"
 #include "mozilla/dom/time/DateCacheCleaner.h"
+#include "mozilla/dom/workers/ServiceWorkerManager.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/IMEStateManager.h"
 #include "mozilla/dom/HTMLVideoElement.h"
 #include "TouchManager.h"
 #include "MediaDecoder.h"
+#include "MediaManager.h"
 #include "MediaPrefs.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/StaticPresData.h"

layout/inspector/moz.build

@@ -26,7 +26,7 @@ EXPORTS += [
     'nsFontFaceList.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'inCSSValueSearch.cpp',
     'inDeepTreeWalker.cpp',
     'inDOMUtils.cpp',
@@ -37,7 +37,7 @@ UNIFIED_SOURCES += [
 ]
 
 if CONFIG['MOZ_XUL']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'inDOMView.cpp',
     ]
 

layout/ipc/moz.build

@@ -14,12 +14,9 @@ EXPORTS.mozilla.layout += [
     'VsyncParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'RenderFrameChild.cpp',
     'RenderFrameParent.cpp',
-]
-
-SOURCES += [
     'VsyncChild.cpp',
     'VsyncParent.cpp',
 ]

layout/style/nsTransitionManager.cpp

@@ -44,6 +44,7 @@ using mozilla::dom::CSSTransition;
 using mozilla::dom::KeyframeEffectReadOnly;
 
 using namespace mozilla;
+using namespace mozilla::dom;
 using namespace mozilla::css;
 
 namespace {

layout/tools/layout-debug/src/moz.build

@@ -15,7 +15,7 @@ EXPORTS += [
     'nsLayoutDebugCIID.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',