From 1a9db0af8be19548a535d5ec261f54ab195c52af Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Wed, 10 Jun 2020 21:11:56 +0300
Subject: [PATCH] De-unify editor.

---
 editor/composer/moz.build                   | 2 +-
 editor/composer/nsEditingSession.h          | 1 +
 editor/libeditor/HTMLEditorDataTransfer.cpp | 1 +
 editor/libeditor/HTMLStyleEditor.cpp        | 1 +
 editor/libeditor/moz.build                  | 2 +-
 editor/txmgr/moz.build                      | 2 +-
 editor/txtsvc/moz.build                     | 2 +-
 7 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/editor/composer/moz.build b/editor/composer/moz.build
index 4db8c9130..0c972923c 100644
--- a/editor/composer/moz.build
+++ b/editor/composer/moz.build
@@ -14,7 +14,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'composer'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsComposerCommands.cpp',
     'nsComposerCommandsUpdater.cpp',
     'nsComposerController.cpp',
diff --git a/editor/composer/nsEditingSession.h b/editor/composer/nsEditingSession.h
index 6772d3a96..a40f45e2d 100644
--- a/editor/composer/nsEditingSession.h
+++ b/editor/composer/nsEditingSession.h
@@ -27,6 +27,7 @@
 
 #include "nsString.h"                   // for nsCString
 
+class nsPIDOMWindowOuter;
 class mozIDOMWindowProxy;
 class nsIDOMWindow;
 class nsISupports;
diff --git a/editor/libeditor/HTMLEditorDataTransfer.cpp b/editor/libeditor/HTMLEditorDataTransfer.cpp
index 0c01bdd1c..5a5c8a369 100644
--- a/editor/libeditor/HTMLEditorDataTransfer.cpp
+++ b/editor/libeditor/HTMLEditorDataTransfer.cpp
@@ -9,6 +9,7 @@
 #include <string.h>
 
 #include "HTMLEditUtils.h"
+#include "TextEditRules.h"
 #include "TextEditUtils.h"
 #include "WSRunObject.h"
 #include "mozilla/dom/DataTransfer.h"
diff --git a/editor/libeditor/HTMLStyleEditor.cpp b/editor/libeditor/HTMLStyleEditor.cpp
index 7d1217069..72eb1d690 100644
--- a/editor/libeditor/HTMLStyleEditor.cpp
+++ b/editor/libeditor/HTMLStyleEditor.cpp
@@ -6,6 +6,7 @@
 #include "mozilla/HTMLEditor.h"
 
 #include "HTMLEditUtils.h"
+#include "TextEditRules.h"
 #include "TextEditUtils.h"
 #include "TypeInState.h"
 #include "mozilla/Assertions.h"
diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build
index 998ef3d39..516b3c2d8 100644
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -30,7 +30,7 @@ EXPORTS.mozilla += [
     'TextEditRules.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'ChangeAttributeTransaction.cpp',
     'ChangeStyleTransaction.cpp',
     'CompositionTransaction.cpp',
diff --git a/editor/txmgr/moz.build b/editor/txmgr/moz.build
index 3c7f3b55a..4cae5437a 100644
--- a/editor/txmgr/moz.build
+++ b/editor/txmgr/moz.build
@@ -19,7 +19,7 @@ EXPORTS += [
     'nsTransactionManagerCID.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsTransactionItem.cpp',
     'nsTransactionList.cpp',
     'nsTransactionManager.cpp',
diff --git a/editor/txtsvc/moz.build b/editor/txtsvc/moz.build
index 4c0b93419..bf9f22382 100644
--- a/editor/txtsvc/moz.build
+++ b/editor/txtsvc/moz.build
@@ -18,7 +18,7 @@ EXPORTS += [
     'nsTextServicesCID.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]