Bug 1468708 - Part 6. Move HTMLEditorCommands and HTMLEditorController to libeditor. r=masayuki
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 13 Jun 2018 14:49:06 -0700
changeset 422673 c1a45c216af9fd8f7b8823ad5acde9c2c56b0e82
parent 422672 bda1559906a270cdb87bdb85656188ce10579821
child 422674 2887cf2355af0c7e5870ecce8ef022118557c1b9
push id34141
push useraiakab@mozilla.com
push dateFri, 15 Jun 2018 21:49:10 +0000
treeherdermozilla-central@d62ce3e3ee8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1468708
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1468708 - Part 6. Move HTMLEditorCommands and HTMLEditorController to libeditor. r=masayuki HTMLEditorController and HTMLEditorCommands is for execCommand, so we should move from composer to libeditor since HTML editor code is in libeditor. MozReview-Commit-ID: DEBoTqUsQnw
editor/composer/HTMLEditorCommands.cpp
editor/composer/HTMLEditorCommands.h
editor/composer/HTMLEditorController.cpp
editor/composer/HTMLEditorController.h
editor/composer/HTMLEditorDocumentCommands.cpp
editor/composer/moz.build
editor/libeditor/HTMLEditorCommands.cpp
editor/libeditor/HTMLEditorCommands.h
editor/libeditor/HTMLEditorController.cpp
editor/libeditor/HTMLEditorController.h
editor/libeditor/HTMLEditorDocumentCommands.cpp
editor/libeditor/moz.build
--- a/editor/composer/moz.build
+++ b/editor/composer/moz.build
@@ -11,27 +11,22 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chr
 XPIDL_SOURCES += [
     'nsIEditingSession.idl',
 ]
 
 XPIDL_MODULE = 'composer'
 
 UNIFIED_SOURCES += [
     'ComposerCommandsUpdater.cpp',
-    'HTMLEditorCommands.cpp',
-    'HTMLEditorController.cpp',
-    'HTMLEditorDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsEditingSession.cpp',
 ]
 
 EXPORTS.mozilla += [
     'ComposerCommandsUpdater.h',
-    'HTMLEditorCommands.h',
-    'HTMLEditorController.h',
 ]
 
 # Needed because we include HTMLEditor.h which indirectly includes nsDocument.h
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/html',  # For nsHTMLDocument
     '/editor/spellchecker', # nsComposeTxtSrvFilter.h
     '/layout/style', # For things nsHTMLDocument includes.
rename from editor/composer/HTMLEditorCommands.cpp
rename to editor/libeditor/HTMLEditorCommands.cpp
rename from editor/composer/HTMLEditorCommands.h
rename to editor/libeditor/HTMLEditorCommands.h
rename from editor/composer/HTMLEditorController.cpp
rename to editor/libeditor/HTMLEditorController.cpp
rename from editor/composer/HTMLEditorController.h
rename to editor/libeditor/HTMLEditorController.h
rename from editor/composer/HTMLEditorDocumentCommands.cpp
rename to editor/libeditor/HTMLEditorDocumentCommands.cpp
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -18,16 +18,18 @@ EXPORTS.mozilla += [
     'CSSEditUtils.h',
     'EditAction.h',
     'EditorBase.h',
     'EditorController.h',
     'EditorDOMPoint.h',
     'EditorUtils.h',
     'EditTransactionBase.h',
     'HTMLEditor.h',
+    'HTMLEditorCommands.h',
+    'HTMLEditorController.h',
     'ManualNAC.h',
     'SelectionState.h',
     'TextEditor.h',
     'TextEditRules.h',
 ]
 
 UNIFIED_SOURCES += [
     'ChangeAttributeTransaction.cpp',
@@ -43,17 +45,20 @@ UNIFIED_SOURCES += [
     'EditorCommands.cpp',
     'EditorController.cpp',
     'EditorEventListener.cpp',
     'EditorUtils.cpp',
     'EditTransactionBase.cpp',
     'HTMLAbsPositionEditor.cpp',
     'HTMLAnonymousNodeEditor.cpp',
     'HTMLEditor.cpp',
+    'HTMLEditorCommands.cpp',
+    'HTMLEditorController.cpp',
     'HTMLEditorDataTransfer.cpp',
+    'HTMLEditorDocumentCommands.cpp',
     'HTMLEditorEventListener.cpp',
     'HTMLEditorObjectResizer.cpp',
     'HTMLEditRules.cpp',
     'HTMLEditUtils.cpp',
     'HTMLInlineTableEditor.cpp',
     'HTMLStyleEditor.cpp',
     'HTMLTableEditor.cpp',
     'HTMLURIRefObject.cpp',