From 40847ea6bc623515837842ec2a45942fe2c600a4 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 18 Aug 2014 20:59:37 -0400
Subject: [PATCH] Bug 1055286 - Flatten editor/libeditor/text to
 editor/libeditor; r=poiru

--HG--
rename : editor/libeditor/text/crashtests/403965-1.xhtml => editor/libeditor/crashtests/403965-1.xhtml
rename : editor/libeditor/text/crashtests/580151-1.xhtml => editor/libeditor/crashtests/580151-1.xhtml
rename : editor/libeditor/text/nsInternetCiter.cpp => editor/libeditor/nsInternetCiter.cpp
rename : editor/libeditor/text/nsInternetCiter.h => editor/libeditor/nsInternetCiter.h
rename : editor/libeditor/text/nsPlaintextDataTransfer.cpp => editor/libeditor/nsPlaintextDataTransfer.cpp
rename : editor/libeditor/text/nsPlaintextEditor.cpp => editor/libeditor/nsPlaintextEditor.cpp
rename : editor/libeditor/text/nsPlaintextEditor.h => editor/libeditor/nsPlaintextEditor.h
rename : editor/libeditor/text/nsTextEditRules.cpp => editor/libeditor/nsTextEditRules.cpp
rename : editor/libeditor/text/nsTextEditRules.h => editor/libeditor/nsTextEditRules.h
rename : editor/libeditor/text/nsTextEditRulesBidi.cpp => editor/libeditor/nsTextEditRulesBidi.cpp
rename : editor/libeditor/text/nsTextEditUtils.cpp => editor/libeditor/nsTextEditUtils.cpp
rename : editor/libeditor/text/nsTextEditUtils.h => editor/libeditor/nsTextEditUtils.h
rename : editor/libeditor/text/tests/test_bug1026397.html => editor/libeditor/tests/test_bug1026397.html
rename : editor/libeditor/text/tests/test_bug318065.html => editor/libeditor/tests/test_bug318065.html
rename : editor/libeditor/text/tests/test_bug471319.html => editor/libeditor/tests/test_bug471319.html
rename : editor/libeditor/text/tests/test_bug471722.html => editor/libeditor/tests/test_bug471722.html
rename : editor/libeditor/text/tests/test_bug483651.html => editor/libeditor/tests/test_bug483651.html
rename : editor/libeditor/text/tests/test_bug527935.html => editor/libeditor/tests/test_bug527935.html
rename : editor/libeditor/text/tests/test_bug569988.html => editor/libeditor/tests/test_bug569988.html
rename : editor/libeditor/text/tests/test_bug590554.html => editor/libeditor/tests/test_bug590554.html
rename : editor/libeditor/text/tests/test_bug596001.html => editor/libeditor/tests/test_bug596001.html
rename : editor/libeditor/text/tests/test_bug596333.html => editor/libeditor/tests/test_bug596333.html
rename : editor/libeditor/text/tests/test_bug596506.html => editor/libeditor/tests/test_bug596506.html
rename : editor/libeditor/text/tests/test_bug597331.html => editor/libeditor/tests/test_bug597331.html
rename : editor/libeditor/text/tests/test_bug600570.html => editor/libeditor/tests/test_bug600570.html
rename : editor/libeditor/text/tests/test_bug602130.html => editor/libeditor/tests/test_bug602130.html
rename : editor/libeditor/text/tests/test_bug603556.html => editor/libeditor/tests/test_bug603556.html
rename : editor/libeditor/text/tests/test_bug604532.html => editor/libeditor/tests/test_bug604532.html
rename : editor/libeditor/text/tests/test_bug625452.html => editor/libeditor/tests/test_bug625452.html
rename : editor/libeditor/text/tests/test_bug629172.html => editor/libeditor/tests/test_bug629172.html
rename : editor/libeditor/text/tests/test_bug636465.xul => editor/libeditor/tests/test_bug636465.xul
rename : editor/libeditor/text/tests/test_bug638596.html => editor/libeditor/tests/test_bug638596.html
rename : editor/libeditor/text/tests/test_bug641466.html => editor/libeditor/tests/test_bug641466.html
rename : editor/libeditor/text/tests/test_bug645914.html => editor/libeditor/tests/test_bug645914.html
rename : editor/libeditor/text/tests/test_bug681229.html => editor/libeditor/tests/test_bug681229.html
rename : editor/libeditor/text/tests/test_bug692520.html => editor/libeditor/tests/test_bug692520.html
rename : editor/libeditor/text/tests/test_bug740784.html => editor/libeditor/tests/test_bug740784.html
rename : editor/libeditor/text/tests/test_bug757771.html => editor/libeditor/tests/test_bug757771.html
rename : editor/libeditor/text/tests/test_bug830600.html => editor/libeditor/tests/test_bug830600.html
rename : editor/libeditor/text/tests/test_dom_input_event_on_texteditor.html => editor/libeditor/tests/test_dom_input_event_on_texteditor.html
rename : editor/libeditor/text/tests/test_texteditor_keyevent_handling.html => editor/libeditor/tests/test_texteditor_keyevent_handling.html
---
 content/html/content/src/moz.build            |  1 -
 editor/crashtests.list                        |  1 -
 .../{text => }/crashtests/403965-1.xhtml      |  0
 .../{text => }/crashtests/580151-1.xhtml      |  0
 editor/libeditor/crashtests/crashtests.list   |  2 ++
 editor/libeditor/moz.build                    |  9 +++--
 editor/libeditor/nsEditor.cpp                 |  2 +-
 .../libeditor/{text => }/nsInternetCiter.cpp  |  2 +-
 editor/libeditor/{text => }/nsInternetCiter.h |  0
 .../{text => }/nsPlaintextDataTransfer.cpp    |  0
 .../{text => }/nsPlaintextEditor.cpp          |  2 +-
 .../libeditor/{text => }/nsPlaintextEditor.h  |  0
 .../libeditor/{text => }/nsTextEditRules.cpp  |  0
 editor/libeditor/{text => }/nsTextEditRules.h |  0
 .../{text => }/nsTextEditRulesBidi.cpp        |  0
 .../libeditor/{text => }/nsTextEditUtils.cpp  |  0
 editor/libeditor/{text => }/nsTextEditUtils.h |  0
 editor/libeditor/tests/chrome.ini             | 10 ++++++
 editor/libeditor/tests/mochitest.ini          | 30 +++++++++++++++++
 .../{text => }/tests/test_bug1026397.html     |  0
 .../{text => }/tests/test_bug318065.html      |  0
 .../{text => }/tests/test_bug471319.html      |  0
 .../{text => }/tests/test_bug471722.html      |  0
 .../{text => }/tests/test_bug483651.html      |  0
 .../{text => }/tests/test_bug527935.html      |  0
 .../{text => }/tests/test_bug569988.html      |  0
 .../{text => }/tests/test_bug590554.html      |  0
 .../{text => }/tests/test_bug596001.html      |  0
 .../{text => }/tests/test_bug596333.html      |  0
 .../{text => }/tests/test_bug596506.html      |  0
 .../{text => }/tests/test_bug597331.html      |  0
 .../{text => }/tests/test_bug600570.html      |  0
 .../{text => }/tests/test_bug602130.html      |  0
 .../{text => }/tests/test_bug603556.html      |  0
 .../{text => }/tests/test_bug604532.html      |  0
 .../{text => }/tests/test_bug625452.html      |  0
 .../{text => }/tests/test_bug629172.html      |  0
 .../{text => }/tests/test_bug636465.xul       |  0
 .../{text => }/tests/test_bug638596.html      |  0
 .../{text => }/tests/test_bug641466.html      |  0
 .../{text => }/tests/test_bug645914.html      |  0
 .../{text => }/tests/test_bug681229.html      |  0
 .../{text => }/tests/test_bug692520.html      |  0
 .../{text => }/tests/test_bug740784.html      |  0
 .../{text => }/tests/test_bug757771.html      |  0
 .../{text => }/tests/test_bug830600.html      |  0
 .../test_dom_input_event_on_texteditor.html   |  0
 .../test_texteditor_keyevent_handling.html    |  0
 .../libeditor/text/crashtests/crashtests.list |  2 --
 editor/libeditor/text/moz.build               | 28 ----------------
 editor/libeditor/text/tests/chrome.ini        | 10 ------
 editor/libeditor/text/tests/mochitest.ini     | 33 -------------------
 layout/build/moz.build                        |  1 -
 layout/forms/moz.build                        |  1 -
 testing/mochitest/androidx86.json             |  4 +--
 55 files changed, 53 insertions(+), 85 deletions(-)
 rename editor/libeditor/{text => }/crashtests/403965-1.xhtml (100%)
 rename editor/libeditor/{text => }/crashtests/580151-1.xhtml (100%)
 rename editor/libeditor/{text => }/nsInternetCiter.cpp (99%)
 rename editor/libeditor/{text => }/nsInternetCiter.h (100%)
 rename editor/libeditor/{text => }/nsPlaintextDataTransfer.cpp (100%)
 rename editor/libeditor/{text => }/nsPlaintextEditor.cpp (99%)
 rename editor/libeditor/{text => }/nsPlaintextEditor.h (100%)
 rename editor/libeditor/{text => }/nsTextEditRules.cpp (100%)
 rename editor/libeditor/{text => }/nsTextEditRules.h (100%)
 rename editor/libeditor/{text => }/nsTextEditRulesBidi.cpp (100%)
 rename editor/libeditor/{text => }/nsTextEditUtils.cpp (100%)
 rename editor/libeditor/{text => }/nsTextEditUtils.h (100%)
 rename editor/libeditor/{text => }/tests/test_bug1026397.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug318065.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug471319.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug471722.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug483651.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug527935.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug569988.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug590554.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug596001.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug596333.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug596506.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug597331.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug600570.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug602130.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug603556.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug604532.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug625452.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug629172.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug636465.xul (100%)
 rename editor/libeditor/{text => }/tests/test_bug638596.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug641466.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug645914.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug681229.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug692520.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug740784.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug757771.html (100%)
 rename editor/libeditor/{text => }/tests/test_bug830600.html (100%)
 rename editor/libeditor/{text => }/tests/test_dom_input_event_on_texteditor.html (100%)
 rename editor/libeditor/{text => }/tests/test_texteditor_keyevent_handling.html (100%)
 delete mode 100644 editor/libeditor/text/crashtests/crashtests.list
 delete mode 100644 editor/libeditor/text/moz.build
 delete mode 100644 editor/libeditor/text/tests/chrome.ini
 delete mode 100644 editor/libeditor/text/tests/mochitest.ini

diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index 9421e0978b8..e23a8fa5ec9 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -179,7 +179,6 @@ LOCAL_INCLUDES += [
     '/dom/canvas',
     '/dom/xbl',
     '/editor/libeditor',
-    '/editor/libeditor/text',
     '/editor/txmgr',
     '/layout/forms',
     '/layout/generic',
diff --git a/editor/crashtests.list b/editor/crashtests.list
index f6eed56966f..5c8a04b68aa 100644
--- a/editor/crashtests.list
+++ b/editor/crashtests.list
@@ -3,6 +3,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include libeditor/crashtests/crashtests.list
-include libeditor/text/crashtests/crashtests.list
 include composer/crashtests/crashtests.list
 include txmgr/tests/crashtests/crashtests.list
diff --git a/editor/libeditor/text/crashtests/403965-1.xhtml b/editor/libeditor/crashtests/403965-1.xhtml
similarity index 100%
rename from editor/libeditor/text/crashtests/403965-1.xhtml
rename to editor/libeditor/crashtests/403965-1.xhtml
diff --git a/editor/libeditor/text/crashtests/580151-1.xhtml b/editor/libeditor/crashtests/580151-1.xhtml
similarity index 100%
rename from editor/libeditor/text/crashtests/580151-1.xhtml
rename to editor/libeditor/crashtests/580151-1.xhtml
diff --git a/editor/libeditor/crashtests/crashtests.list b/editor/libeditor/crashtests/crashtests.list
index c743ac1b1fb..be753fdc175 100644
--- a/editor/libeditor/crashtests/crashtests.list
+++ b/editor/libeditor/crashtests/crashtests.list
@@ -3,6 +3,7 @@ load 336104.html
 load 382527-1.html
 load 382778-1.html
 load 402172-1.html
+load 403965-1.xhtml
 load 407074-1.html
 load 407079-1.html
 load 407256-1.html
@@ -26,6 +27,7 @@ load 503709-1.xhtml
 load 513375-1.xhtml
 load 535632-1.xhtml
 load 574558-1.xhtml
+load 580151-1.xhtml
 load 582138-1.xhtml
 load 612565-1.html
 asserts(0-6) load 615015-1.html # Bug 439258
diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build
index ec6d5a6aac7..bb58db18995 100644
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -4,8 +4,6 @@
 # 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/.
 
-DIRS += ['text']
-
 TEST_DIRS += ['tests']
 
 UNIFIED_SOURCES += [
@@ -39,9 +37,15 @@ UNIFIED_SOURCES += [
     'nsHTMLInlineTableEditor.cpp',
     'nsHTMLObjectResizer.cpp',
     'nsHTMLURIRefObject.cpp',
+    'nsInternetCiter.cpp',
+    'nsPlaintextDataTransfer.cpp',
+    'nsPlaintextEditor.cpp',
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
     'nsTableEditor.cpp',
+    'nsTextEditRules.cpp',
+    'nsTextEditRulesBidi.cpp',
+    'nsTextEditUtils.cpp',
     'nsWSRunObject.cpp',
     'PlaceholderTxn.cpp',
     'SetDocTitleTxn.cpp',
@@ -60,7 +64,6 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
-    'text',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp
index 2ed84418761..d3261d0e91f 100644
--- a/editor/libeditor/nsEditor.cpp
+++ b/editor/libeditor/nsEditor.cpp
@@ -4755,7 +4755,7 @@ nsresult
 nsEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
 {
   // NOTE: When you change this method, you should also change:
-  //   * editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
+  //   * editor/libeditor/tests/test_texteditor_keyevent_handling.html
   //   * editor/libeditor/tests/test_htmleditor_keyevent_handling.html
   //
   // And also when you add new key handling, you need to change the subclass's
diff --git a/editor/libeditor/text/nsInternetCiter.cpp b/editor/libeditor/nsInternetCiter.cpp
similarity index 99%
rename from editor/libeditor/text/nsInternetCiter.cpp
rename to editor/libeditor/nsInternetCiter.cpp
index 4cd658aa343..1ab040fc8b4 100644
--- a/editor/libeditor/text/nsInternetCiter.cpp
+++ b/editor/libeditor/nsInternetCiter.cpp
@@ -19,7 +19,6 @@
 
 const char16_t gt ('>');
 const char16_t space (' ');
-const char16_t nbsp (0xa0);
 const char16_t nl ('\n');
 const char16_t cr('\r');
 
@@ -142,6 +141,7 @@ BreakLine(nsAString& aOutString, uint32_t& outStringCol,
 
 static inline bool IsSpace(char16_t c)
 {
+  const char16_t nbsp (0xa0);
   return (nsCRT::IsAsciiSpace(c) || (c == nl) || (c == cr) || (c == nbsp));
 }
 
diff --git a/editor/libeditor/text/nsInternetCiter.h b/editor/libeditor/nsInternetCiter.h
similarity index 100%
rename from editor/libeditor/text/nsInternetCiter.h
rename to editor/libeditor/nsInternetCiter.h
diff --git a/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/editor/libeditor/nsPlaintextDataTransfer.cpp
similarity index 100%
rename from editor/libeditor/text/nsPlaintextDataTransfer.cpp
rename to editor/libeditor/nsPlaintextDataTransfer.cpp
diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/nsPlaintextEditor.cpp
similarity index 99%
rename from editor/libeditor/text/nsPlaintextEditor.cpp
rename to editor/libeditor/nsPlaintextEditor.cpp
index 3749c95e20a..2bc42a2087f 100644
--- a/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/editor/libeditor/nsPlaintextEditor.cpp
@@ -350,7 +350,7 @@ nsresult
 nsPlaintextEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
 {
   // NOTE: When you change this method, you should also change:
-  //   * editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
+  //   * editor/libeditor/tests/test_texteditor_keyevent_handling.html
   //   * editor/libeditor/tests/test_htmleditor_keyevent_handling.html
   //
   // And also when you add new key handling, you need to change the subclass's
diff --git a/editor/libeditor/text/nsPlaintextEditor.h b/editor/libeditor/nsPlaintextEditor.h
similarity index 100%
rename from editor/libeditor/text/nsPlaintextEditor.h
rename to editor/libeditor/nsPlaintextEditor.h
diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/nsTextEditRules.cpp
similarity index 100%
rename from editor/libeditor/text/nsTextEditRules.cpp
rename to editor/libeditor/nsTextEditRules.cpp
diff --git a/editor/libeditor/text/nsTextEditRules.h b/editor/libeditor/nsTextEditRules.h
similarity index 100%
rename from editor/libeditor/text/nsTextEditRules.h
rename to editor/libeditor/nsTextEditRules.h
diff --git a/editor/libeditor/text/nsTextEditRulesBidi.cpp b/editor/libeditor/nsTextEditRulesBidi.cpp
similarity index 100%
rename from editor/libeditor/text/nsTextEditRulesBidi.cpp
rename to editor/libeditor/nsTextEditRulesBidi.cpp
diff --git a/editor/libeditor/text/nsTextEditUtils.cpp b/editor/libeditor/nsTextEditUtils.cpp
similarity index 100%
rename from editor/libeditor/text/nsTextEditUtils.cpp
rename to editor/libeditor/nsTextEditUtils.cpp
diff --git a/editor/libeditor/text/nsTextEditUtils.h b/editor/libeditor/nsTextEditUtils.h
similarity index 100%
rename from editor/libeditor/text/nsTextEditUtils.h
rename to editor/libeditor/nsTextEditUtils.h
diff --git a/editor/libeditor/tests/chrome.ini b/editor/libeditor/tests/chrome.ini
index 95d676ee83b..69bebc6a319 100644
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -3,18 +3,28 @@ support-files = green.png
 
 [test_bug46555.html]
 [test_bug366682.html]
+[test_bug471319.html]
+[test_bug483651.html]
 [test_bug489202.xul]
 [test_bug490879.xul]
+[test_bug569988.html]
+skip-if = buildapp == 'mulet'
 [test_bug599983.xul]
 skip-if = buildapp == 'mulet'
 [test_bug607584.xul]
 [test_bug616590.xul]
 [test_bug635636.html]
+[test_bug636465.xul]
 [test_bug646194.xul]
 [test_bug780908.xul]
+[test_bug830600.html]
 [test_composition_event_created_in_chrome.html]
 [test_contenteditable_text_input_handling.html]
 [test_dragdrop.html]
 skip-if = buildapp == 'mulet'
 [test_htmleditor_keyevent_handling.html]
 [test_selection_move_commands.xul]
+[test_texteditor_keyevent_handling.html]
+# disables the key handling test on gtk because gtk overrides some key events
+# on our editor, and the combinations depend on the system.
+skip-if = toolkit == "gtk2" || toolkit == "gtk3"
diff --git a/editor/libeditor/tests/mochitest.ini b/editor/libeditor/tests/mochitest.ini
index 6fb718c014f..40091d25de1 100644
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -18,6 +18,7 @@ skip-if = os != "mac"
 [test_bug290026.html]
 [test_bug291780.html]
 [test_bug316447.html]
+[test_bug318065.html]
 [test_bug332636.html]
 support-files = test_bug332636.html^headers^
 [test_bug372345.html]
@@ -38,6 +39,7 @@ skip-if = toolkit == 'android' || e10s
 [test_bug456244.html]
 [test_bug460740.html]
 [test_bug468353.html]
+[test_bug471722.html]
 [test_bug478725.html]
 skip-if = toolkit == 'android' || e10s
 [test_bug480647.html]
@@ -52,6 +54,8 @@ skip-if = toolkit == 'android' || e10s
 skip-if = toolkit == 'android' || e10s
 [test_bug525389.html]
 skip-if = toolkit == 'android' || e10s
+[test_bug527935.html]
+skip-if = toolkit == 'android' || e10s
 [test_bug537046.html]
 [test_bug549262.html]
 skip-if = toolkit == 'android' || e10s
@@ -64,11 +68,24 @@ skip-if = toolkit == 'android' || e10s
 [test_bug586662.html]
 skip-if = toolkit == 'android' || e10s
 [test_bug587461.html]
+[test_bug590554.html]
 [test_bug592592.html]
+[test_bug596001.html]
+[test_bug596333.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug596506.html]
+[test_bug597331.html]
+skip-if = buildapp == 'mulet'
 [test_bug597784.html]
 [test_bug599322.html]
 skip-if = toolkit == 'android' || e10s
 [test_bug599983.html]
+[test_bug600570.html]
+skip-if = toolkit == 'android'
+[test_bug602130.html]
+[test_bug603556.html]
+[test_bug604532.html]
+skip-if = toolkit == 'android'
 [test_bug607584.html]
 [test_bug611182.html]
 skip-if = toolkit == 'android'
@@ -78,9 +95,15 @@ skip-if = toolkit == 'android'
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug622371.html]
 skip-if = toolkit == 'android' #bug 957797
+[test_bug625452.html]
+[test_bug629172.html]
+skip-if = toolkit == 'android' || e10s
 [test_bug629845.html]
+[test_bug638596.html]
 [test_bug640321.html]
 skip-if = e10s
+[test_bug641466.html]
+[test_bug645914.html]
 [test_bug668599.html]
 [test_bug674770-1.html]
 skip-if = toolkit == 'android' || e10s
@@ -89,13 +112,17 @@ skip-if = toolkit == 'android' || e10s
 [test_bug674861.html]
 [test_bug676401.html]
 [test_bug677752.html]
+[test_bug681229.html]
 [test_bug686203.html]
+[test_bug692520.html]
 [test_bug697842.html]
 [test_bug725069.html]
 [test_bug735059.html]
 [test_bug738366.html]
+[test_bug740784.html]
 [test_bug742261.html]
 [test_bug757371.html]
+[test_bug757771.html]
 [test_bug767684.html]
 [test_bug773262.html]
 [test_bug780035.html]
@@ -110,10 +137,13 @@ skip-if = os != "win"
 [test_bug966552.html]
 skip-if = os != "win"
 [test_bug998188.html]
+[test_bug1026397.html]
+skip-if = e10s
 [test_CF_HTML_clipboard.html]
 [test_contenteditable_focus.html]
 [test_dom_input_event_on_htmleditor.html]
 skip-if = toolkit == 'android' # bug 1054087
+[test_dom_input_event_on_texteditor.html]
 [test_keypress_untrusted_event.html]
 [test_root_element_replacement.html]
 [test_select_all_without_body.html]
diff --git a/editor/libeditor/text/tests/test_bug1026397.html b/editor/libeditor/tests/test_bug1026397.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug1026397.html
rename to editor/libeditor/tests/test_bug1026397.html
diff --git a/editor/libeditor/text/tests/test_bug318065.html b/editor/libeditor/tests/test_bug318065.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug318065.html
rename to editor/libeditor/tests/test_bug318065.html
diff --git a/editor/libeditor/text/tests/test_bug471319.html b/editor/libeditor/tests/test_bug471319.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug471319.html
rename to editor/libeditor/tests/test_bug471319.html
diff --git a/editor/libeditor/text/tests/test_bug471722.html b/editor/libeditor/tests/test_bug471722.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug471722.html
rename to editor/libeditor/tests/test_bug471722.html
diff --git a/editor/libeditor/text/tests/test_bug483651.html b/editor/libeditor/tests/test_bug483651.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug483651.html
rename to editor/libeditor/tests/test_bug483651.html
diff --git a/editor/libeditor/text/tests/test_bug527935.html b/editor/libeditor/tests/test_bug527935.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug527935.html
rename to editor/libeditor/tests/test_bug527935.html
diff --git a/editor/libeditor/text/tests/test_bug569988.html b/editor/libeditor/tests/test_bug569988.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug569988.html
rename to editor/libeditor/tests/test_bug569988.html
diff --git a/editor/libeditor/text/tests/test_bug590554.html b/editor/libeditor/tests/test_bug590554.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug590554.html
rename to editor/libeditor/tests/test_bug590554.html
diff --git a/editor/libeditor/text/tests/test_bug596001.html b/editor/libeditor/tests/test_bug596001.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug596001.html
rename to editor/libeditor/tests/test_bug596001.html
diff --git a/editor/libeditor/text/tests/test_bug596333.html b/editor/libeditor/tests/test_bug596333.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug596333.html
rename to editor/libeditor/tests/test_bug596333.html
diff --git a/editor/libeditor/text/tests/test_bug596506.html b/editor/libeditor/tests/test_bug596506.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug596506.html
rename to editor/libeditor/tests/test_bug596506.html
diff --git a/editor/libeditor/text/tests/test_bug597331.html b/editor/libeditor/tests/test_bug597331.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug597331.html
rename to editor/libeditor/tests/test_bug597331.html
diff --git a/editor/libeditor/text/tests/test_bug600570.html b/editor/libeditor/tests/test_bug600570.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug600570.html
rename to editor/libeditor/tests/test_bug600570.html
diff --git a/editor/libeditor/text/tests/test_bug602130.html b/editor/libeditor/tests/test_bug602130.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug602130.html
rename to editor/libeditor/tests/test_bug602130.html
diff --git a/editor/libeditor/text/tests/test_bug603556.html b/editor/libeditor/tests/test_bug603556.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug603556.html
rename to editor/libeditor/tests/test_bug603556.html
diff --git a/editor/libeditor/text/tests/test_bug604532.html b/editor/libeditor/tests/test_bug604532.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug604532.html
rename to editor/libeditor/tests/test_bug604532.html
diff --git a/editor/libeditor/text/tests/test_bug625452.html b/editor/libeditor/tests/test_bug625452.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug625452.html
rename to editor/libeditor/tests/test_bug625452.html
diff --git a/editor/libeditor/text/tests/test_bug629172.html b/editor/libeditor/tests/test_bug629172.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug629172.html
rename to editor/libeditor/tests/test_bug629172.html
diff --git a/editor/libeditor/text/tests/test_bug636465.xul b/editor/libeditor/tests/test_bug636465.xul
similarity index 100%
rename from editor/libeditor/text/tests/test_bug636465.xul
rename to editor/libeditor/tests/test_bug636465.xul
diff --git a/editor/libeditor/text/tests/test_bug638596.html b/editor/libeditor/tests/test_bug638596.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug638596.html
rename to editor/libeditor/tests/test_bug638596.html
diff --git a/editor/libeditor/text/tests/test_bug641466.html b/editor/libeditor/tests/test_bug641466.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug641466.html
rename to editor/libeditor/tests/test_bug641466.html
diff --git a/editor/libeditor/text/tests/test_bug645914.html b/editor/libeditor/tests/test_bug645914.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug645914.html
rename to editor/libeditor/tests/test_bug645914.html
diff --git a/editor/libeditor/text/tests/test_bug681229.html b/editor/libeditor/tests/test_bug681229.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug681229.html
rename to editor/libeditor/tests/test_bug681229.html
diff --git a/editor/libeditor/text/tests/test_bug692520.html b/editor/libeditor/tests/test_bug692520.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug692520.html
rename to editor/libeditor/tests/test_bug692520.html
diff --git a/editor/libeditor/text/tests/test_bug740784.html b/editor/libeditor/tests/test_bug740784.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug740784.html
rename to editor/libeditor/tests/test_bug740784.html
diff --git a/editor/libeditor/text/tests/test_bug757771.html b/editor/libeditor/tests/test_bug757771.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug757771.html
rename to editor/libeditor/tests/test_bug757771.html
diff --git a/editor/libeditor/text/tests/test_bug830600.html b/editor/libeditor/tests/test_bug830600.html
similarity index 100%
rename from editor/libeditor/text/tests/test_bug830600.html
rename to editor/libeditor/tests/test_bug830600.html
diff --git a/editor/libeditor/text/tests/test_dom_input_event_on_texteditor.html b/editor/libeditor/tests/test_dom_input_event_on_texteditor.html
similarity index 100%
rename from editor/libeditor/text/tests/test_dom_input_event_on_texteditor.html
rename to editor/libeditor/tests/test_dom_input_event_on_texteditor.html
diff --git a/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html b/editor/libeditor/tests/test_texteditor_keyevent_handling.html
similarity index 100%
rename from editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
rename to editor/libeditor/tests/test_texteditor_keyevent_handling.html
diff --git a/editor/libeditor/text/crashtests/crashtests.list b/editor/libeditor/text/crashtests/crashtests.list
deleted file mode 100644
index 77fa4db9d93..00000000000
--- a/editor/libeditor/text/crashtests/crashtests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-load 403965-1.xhtml
-load 580151-1.xhtml
diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build
deleted file mode 100644
index 99eb178d1ae..00000000000
--- a/editor/libeditor/text/moz.build
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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 += [
-    'nsInternetCiter.cpp',
-    'nsPlaintextDataTransfer.cpp',
-    'nsPlaintextEditor.cpp',
-    'nsTextEditRules.cpp',
-    'nsTextEditRulesBidi.cpp',
-    'nsTextEditUtils.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '..',
-    '/content/base/src',
-    '/editor/txmgr',
-]
-
-FINAL_LIBRARY = 'xul'
-
-MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
diff --git a/editor/libeditor/text/tests/chrome.ini b/editor/libeditor/text/tests/chrome.ini
deleted file mode 100644
index 699c1f0fe38..00000000000
--- a/editor/libeditor/text/tests/chrome.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[test_bug471319.html]
-[test_bug483651.html]
-[test_bug569988.html]
-skip-if = buildapp == 'mulet'
-[test_bug636465.xul]
-[test_bug830600.html]
-[test_texteditor_keyevent_handling.html]
-# disables the key handling test on gtk because gtk overrides some key events
-# on our editor, and the combinations depend on the system.
-skip-if = toolkit == "gtk2" || toolkit == "gtk3"
diff --git a/editor/libeditor/text/tests/mochitest.ini b/editor/libeditor/text/tests/mochitest.ini
deleted file mode 100644
index 8be1128fd8a..00000000000
--- a/editor/libeditor/text/tests/mochitest.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-[DEFAULT]
-skip-if = buildapp == 'b2g'
-
-[test_bug318065.html]
-[test_bug471722.html]
-[test_bug527935.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug590554.html]
-[test_bug596001.html]
-[test_bug596333.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug596506.html]
-[test_bug597331.html]
-skip-if = buildapp == 'mulet'
-[test_bug600570.html]
-skip-if = toolkit == 'android'
-[test_bug602130.html]
-[test_bug603556.html]
-[test_bug604532.html]
-skip-if = toolkit == 'android'
-[test_bug625452.html]
-[test_bug629172.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug638596.html]
-[test_bug641466.html]
-[test_bug645914.html]
-[test_bug681229.html]
-[test_bug692520.html]
-[test_bug740784.html]
-[test_bug757771.html]
-[test_bug1026397.html]
-skip-if = e10s
-[test_dom_input_event_on_texteditor.html]
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 2c7e1e10289..a934fac5bf3 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -66,7 +66,6 @@ LOCAL_INCLUDES += [
     '/dom/xslt/xslt',
     '/editor/composer',
     '/editor/libeditor',
-    '/editor/libeditor/text',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index a2130dab62f..9cdea8e416d 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -46,7 +46,6 @@ LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
     '../../editor/libeditor',
-    '../../editor/libeditor/text',
     '../../editor/txmgr',
     '../base',
     '../generic',
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index 035045d580d..4c73680a796 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -91,8 +91,8 @@
   "dom/imptests/html/webgl": "WebGL",
   "dom/inputmethod": "Not supported on Android",
   "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
-  "editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
-  "editor/libeditor/text/tests/test_texteditor_keyevent_handling.html": "",
+  "editor/libeditor/tests/test_bug569988.html": "TIMED_OUT",
+  "editor/libeditor/tests/test_texteditor_keyevent_handling.html": "",
   "Harness_sanity/test_sanityWindowSnapshot.html": "x86 only",
   "image/test/mochitest/test_bug671906.html": "x86 only",
   "image/test/mochitest/test_bug89419-2.html": "x86 only",