From a237454b5fe56f674d334a3ccf2b423c949e031c Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Thu, 7 May 2020 14:45:44 +0300
Subject: [PATCH] De-unify build/ inspector/ ipc/ tools/layout-debug/src/ in
 layout/.

---
 layout/build/moz.build                  | 2 +-
 layout/build/nsLayoutStatics.cpp        | 2 ++
 layout/inspector/moz.build              | 4 ++--
 layout/ipc/moz.build                    | 5 +----
 layout/style/nsTransitionManager.cpp    | 1 +
 layout/tools/layout-debug/src/moz.build | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/layout/build/moz.build b/layout/build/moz.build
index ecf180d78..360fe3c97 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -10,7 +10,7 @@ EXPORTS += [
     'nsLayoutStatics.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsContentDLF.cpp',
     'nsLayoutModule.cpp',
     'nsLayoutStatics.cpp',
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 27236e3f4..daefad038 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/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"
diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build
index 1576b7d14..bbf808292 100644
--- a/layout/inspector/moz.build
+++ b/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',
     ]
 
diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build
index d9cf962ca..919a9df7a 100644
--- a/layout/ipc/moz.build
+++ b/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',
 ]
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 118702e8f..a317f9943 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/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 {
diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build
index be7abcab0..b3f7d5e06 100644
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -15,7 +15,7 @@ EXPORTS += [
     'nsLayoutDebugCIID.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',