Bug 1055105 - Flatten editor/libeditor/html to editor/libeditor; r=poiru
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 18 Aug 2014 17:28:17 -0400
changeset 221844 a357afff88300587c1905f01819c777f461af7eb
parent 221843 c69cc7b3c21d95b7e4490be0aee1264affd25265
child 221845 ecded1b76db35b9c13e5a4b1c50d10edcb8fe3cb
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspoiru
bugs1055105
milestone34.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 1055105 - Flatten editor/libeditor/html to editor/libeditor; r=poiru
editor/crashtests.list
editor/libeditor/TextEditorTest.cpp
editor/libeditor/TextEditorTest.h
editor/libeditor/TypeInState.cpp
editor/libeditor/TypeInState.h
editor/libeditor/crashtests/336081-1.xhtml
editor/libeditor/crashtests/382778-1.html
editor/libeditor/crashtests/407074-1.html
editor/libeditor/crashtests/407277-1.html
editor/libeditor/crashtests/414178-1.html
editor/libeditor/crashtests/418923-1.html
editor/libeditor/crashtests/420439.html
editor/libeditor/crashtests/428489-1.html
editor/libeditor/crashtests/431086-1.xhtml
editor/libeditor/crashtests/448329-1.html
editor/libeditor/crashtests/448329-2.html
editor/libeditor/crashtests/448329-3.html
editor/libeditor/crashtests/456727-1.html
editor/libeditor/crashtests/456727-2.html
editor/libeditor/crashtests/467647-1.html
editor/libeditor/crashtests/499844-1.html
editor/libeditor/crashtests/503709-1.xhtml
editor/libeditor/crashtests/513375-1.xhtml
editor/libeditor/crashtests/535632-1.xhtml
editor/libeditor/crashtests/574558-1.xhtml
editor/libeditor/crashtests/582138-1.xhtml
editor/libeditor/crashtests/612565-1.html
editor/libeditor/crashtests/615015-1.html
editor/libeditor/crashtests/615450-1.html
editor/libeditor/crashtests/639736-1.xhtml
editor/libeditor/crashtests/643786-1.html
editor/libeditor/crashtests/682650-1.html
editor/libeditor/crashtests/716456-1.html
editor/libeditor/crashtests/759748.html
editor/libeditor/crashtests/761861.html
editor/libeditor/crashtests/766305.html
editor/libeditor/crashtests/766387.html
editor/libeditor/crashtests/766795.html
editor/libeditor/crashtests/767169.html
editor/libeditor/crashtests/768748.html
editor/libeditor/crashtests/769008-1.html
editor/libeditor/crashtests/769967.xhtml
editor/libeditor/crashtests/793866.html
editor/libeditor/crashtests/crashtests.list
editor/libeditor/html/TextEditorTest.cpp
editor/libeditor/html/TextEditorTest.h
editor/libeditor/html/TypeInState.cpp
editor/libeditor/html/TypeInState.h
editor/libeditor/html/crashtests/336081-1.xhtml
editor/libeditor/html/crashtests/382778-1.html
editor/libeditor/html/crashtests/407074-1.html
editor/libeditor/html/crashtests/407277-1.html
editor/libeditor/html/crashtests/414178-1.html
editor/libeditor/html/crashtests/418923-1.html
editor/libeditor/html/crashtests/420439.html
editor/libeditor/html/crashtests/428489-1.html
editor/libeditor/html/crashtests/431086-1.xhtml
editor/libeditor/html/crashtests/448329-1.html
editor/libeditor/html/crashtests/448329-2.html
editor/libeditor/html/crashtests/448329-3.html
editor/libeditor/html/crashtests/456727-1.html
editor/libeditor/html/crashtests/456727-2.html
editor/libeditor/html/crashtests/467647-1.html
editor/libeditor/html/crashtests/499844-1.html
editor/libeditor/html/crashtests/503709-1.xhtml
editor/libeditor/html/crashtests/513375-1.xhtml
editor/libeditor/html/crashtests/535632-1.xhtml
editor/libeditor/html/crashtests/574558-1.xhtml
editor/libeditor/html/crashtests/582138-1.xhtml
editor/libeditor/html/crashtests/612565-1.html
editor/libeditor/html/crashtests/615015-1.html
editor/libeditor/html/crashtests/615450-1.html
editor/libeditor/html/crashtests/639736-1.xhtml
editor/libeditor/html/crashtests/643786-1.html
editor/libeditor/html/crashtests/682650-1.html
editor/libeditor/html/crashtests/716456-1.html
editor/libeditor/html/crashtests/759748.html
editor/libeditor/html/crashtests/761861.html
editor/libeditor/html/crashtests/766305.html
editor/libeditor/html/crashtests/766387.html
editor/libeditor/html/crashtests/766795.html
editor/libeditor/html/crashtests/767169.html
editor/libeditor/html/crashtests/768748.html
editor/libeditor/html/crashtests/769008-1.html
editor/libeditor/html/crashtests/769967.xhtml
editor/libeditor/html/crashtests/793866.html
editor/libeditor/html/crashtests/crashtests.list
editor/libeditor/html/moz.build
editor/libeditor/html/nsEditProperty.cpp
editor/libeditor/html/nsHTMLAbsPosition.cpp
editor/libeditor/html/nsHTMLAnonymousUtils.cpp
editor/libeditor/html/nsHTMLCSSUtils.cpp
editor/libeditor/html/nsHTMLCSSUtils.h
editor/libeditor/html/nsHTMLDataTransfer.cpp
editor/libeditor/html/nsHTMLEditRules.cpp
editor/libeditor/html/nsHTMLEditRules.h
editor/libeditor/html/nsHTMLEditUtils.cpp
editor/libeditor/html/nsHTMLEditUtils.h
editor/libeditor/html/nsHTMLEditor.cpp
editor/libeditor/html/nsHTMLEditor.h
editor/libeditor/html/nsHTMLEditorEventListener.cpp
editor/libeditor/html/nsHTMLEditorEventListener.h
editor/libeditor/html/nsHTMLEditorStyle.cpp
editor/libeditor/html/nsHTMLInlineTableEditor.cpp
editor/libeditor/html/nsHTMLObjectResizer.cpp
editor/libeditor/html/nsHTMLObjectResizer.h
editor/libeditor/html/nsHTMLURIRefObject.cpp
editor/libeditor/html/nsHTMLURIRefObject.h
editor/libeditor/html/nsTableEditor.cpp
editor/libeditor/html/nsWSRunObject.cpp
editor/libeditor/html/nsWSRunObject.h
editor/libeditor/html/tests/browserscope/lib/richtext/LICENSE
editor/libeditor/html/tests/browserscope/lib/richtext/README
editor/libeditor/html/tests/browserscope/lib/richtext/README.Mozilla
editor/libeditor/html/tests/browserscope/lib/richtext/currentStatus.js
editor/libeditor/html/tests/browserscope/lib/richtext/current_revision
editor/libeditor/html/tests/browserscope/lib/richtext/richtext/editable.html
editor/libeditor/html/tests/browserscope/lib/richtext/richtext/js/range.js
editor/libeditor/html/tests/browserscope/lib/richtext/richtext/richtext.html
editor/libeditor/html/tests/browserscope/lib/richtext/update_from_upstream
editor/libeditor/html/tests/browserscope/lib/richtext2/LICENSE
editor/libeditor/html/tests/browserscope/lib/richtext2/README
editor/libeditor/html/tests/browserscope/lib/richtext2/README.Mozilla
editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js
editor/libeditor/html/tests/browserscope/lib/richtext2/current_revision
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/__init__.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/common.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/handlers.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/common.css
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable-body.html
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable-dM.html
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable-div.html
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable.css
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/canonicalize.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/compare.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/output.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/pad.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/range-bootstrap.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/range.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/units.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/variables.js
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/templates/output.html
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/templates/richtext2.html
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/__init__.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/apply.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/applyCSS.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/change.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/changeCSS.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/delete.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/forwarddelete.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryEnabled.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryIndeterm.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryState.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/querySupported.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryValue.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/selection.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/unapply.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/unapplyCSS.py
editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/unittestexample.html
editor/libeditor/html/tests/browserscope/lib/richtext2/update_from_upstream
editor/libeditor/html/tests/browserscope/mochitest.ini
editor/libeditor/html/tests/browserscope/test_richtext.html
editor/libeditor/html/tests/browserscope/test_richtext2.html
editor/libeditor/html/tests/chrome.ini
editor/libeditor/html/tests/data/cfhtml-chromium.txt
editor/libeditor/html/tests/data/cfhtml-firefox.txt
editor/libeditor/html/tests/data/cfhtml-ie.txt
editor/libeditor/html/tests/data/cfhtml-nocontext.txt
editor/libeditor/html/tests/data/cfhtml-ooo.txt
editor/libeditor/html/tests/file_bug549262.html
editor/libeditor/html/tests/file_bug674770-1.html
editor/libeditor/html/tests/file_select_all_without_body.html
editor/libeditor/html/tests/green.png
editor/libeditor/html/tests/mochitest.ini
editor/libeditor/html/tests/moz.build
editor/libeditor/html/tests/test_CF_HTML_clipboard.html
editor/libeditor/html/tests/test_bug200416.html
editor/libeditor/html/tests/test_bug289384.html
editor/libeditor/html/tests/test_bug290026.html
editor/libeditor/html/tests/test_bug291780.html
editor/libeditor/html/tests/test_bug316447.html
editor/libeditor/html/tests/test_bug332636.html
editor/libeditor/html/tests/test_bug332636.html^headers^
editor/libeditor/html/tests/test_bug366682.html
editor/libeditor/html/tests/test_bug372345.html
editor/libeditor/html/tests/test_bug404320.html
editor/libeditor/html/tests/test_bug410986.html
editor/libeditor/html/tests/test_bug414526.html
editor/libeditor/html/tests/test_bug417418.html
editor/libeditor/html/tests/test_bug432225.html
editor/libeditor/html/tests/test_bug439808.html
editor/libeditor/html/tests/test_bug442186.html
editor/libeditor/html/tests/test_bug449243.html
editor/libeditor/html/tests/test_bug455992.html
editor/libeditor/html/tests/test_bug456244.html
editor/libeditor/html/tests/test_bug460740.html
editor/libeditor/html/tests/test_bug468353.html
editor/libeditor/html/tests/test_bug478725.html
editor/libeditor/html/tests/test_bug480647.html
editor/libeditor/html/tests/test_bug480972.html
editor/libeditor/html/tests/test_bug484181.html
editor/libeditor/html/tests/test_bug487524.html
editor/libeditor/html/tests/test_bug489202.xul
editor/libeditor/html/tests/test_bug490879.xul
editor/libeditor/html/tests/test_bug520189.html
editor/libeditor/html/tests/test_bug525389.html
editor/libeditor/html/tests/test_bug537046.html
editor/libeditor/html/tests/test_bug549262.html
editor/libeditor/html/tests/test_bug550434.html
editor/libeditor/html/tests/test_bug551704.html
editor/libeditor/html/tests/test_bug552782.html
editor/libeditor/html/tests/test_bug570144.html
editor/libeditor/html/tests/test_bug578771.html
editor/libeditor/html/tests/test_bug587461.html
editor/libeditor/html/tests/test_bug592592.html
editor/libeditor/html/tests/test_bug597784.html
editor/libeditor/html/tests/test_bug599322.html
editor/libeditor/html/tests/test_bug607584.html
editor/libeditor/html/tests/test_bug607584.xul
editor/libeditor/html/tests/test_bug611182.html
editor/libeditor/html/tests/test_bug612128.html
editor/libeditor/html/tests/test_bug612447.html
editor/libeditor/html/tests/test_bug616590.xul
editor/libeditor/html/tests/test_bug620906.html
editor/libeditor/html/tests/test_bug622371.html
editor/libeditor/html/tests/test_bug629845.html
editor/libeditor/html/tests/test_bug635636.html
editor/libeditor/html/tests/test_bug640321.html
editor/libeditor/html/tests/test_bug668599.html
editor/libeditor/html/tests/test_bug674770-1.html
editor/libeditor/html/tests/test_bug674770-2.html
editor/libeditor/html/tests/test_bug674861.html
editor/libeditor/html/tests/test_bug676401.html
editor/libeditor/html/tests/test_bug677752.html
editor/libeditor/html/tests/test_bug686203.html
editor/libeditor/html/tests/test_bug697842.html
editor/libeditor/html/tests/test_bug725069.html
editor/libeditor/html/tests/test_bug735059.html
editor/libeditor/html/tests/test_bug738366.html
editor/libeditor/html/tests/test_bug757371.html
editor/libeditor/html/tests/test_bug767684.html
editor/libeditor/html/tests/test_bug780035.html
editor/libeditor/html/tests/test_bug780908.xul
editor/libeditor/html/tests/test_bug787432.html
editor/libeditor/html/tests/test_bug790475.html
editor/libeditor/html/tests/test_bug796839.html
editor/libeditor/html/tests/test_bug832025.html
editor/libeditor/html/tests/test_bug857487.html
editor/libeditor/html/tests/test_bug966155.html
editor/libeditor/html/tests/test_bug966552.html
editor/libeditor/html/tests/test_bug998188.html
editor/libeditor/html/tests/test_contenteditable_focus.html
editor/libeditor/html/tests/test_contenteditable_text_input_handling.html
editor/libeditor/html/tests/test_dom_input_event_on_htmleditor.html
editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html
editor/libeditor/html/tests/test_keypress_untrusted_event.html
editor/libeditor/html/tests/test_root_element_replacement.html
editor/libeditor/html/tests/test_select_all_without_body.html
editor/libeditor/html/tests/test_spellcheck_pref.html
editor/libeditor/moz.build
editor/libeditor/nsEditProperty.cpp
editor/libeditor/nsEditor.cpp
editor/libeditor/nsEditorEventListener.cpp
editor/libeditor/nsHTMLAbsPosition.cpp
editor/libeditor/nsHTMLAnonymousUtils.cpp
editor/libeditor/nsHTMLCSSUtils.cpp
editor/libeditor/nsHTMLCSSUtils.h
editor/libeditor/nsHTMLDataTransfer.cpp
editor/libeditor/nsHTMLEditRules.cpp
editor/libeditor/nsHTMLEditRules.h
editor/libeditor/nsHTMLEditUtils.cpp
editor/libeditor/nsHTMLEditUtils.h
editor/libeditor/nsHTMLEditor.cpp
editor/libeditor/nsHTMLEditor.h
editor/libeditor/nsHTMLEditorEventListener.cpp
editor/libeditor/nsHTMLEditorEventListener.h
editor/libeditor/nsHTMLEditorStyle.cpp
editor/libeditor/nsHTMLInlineTableEditor.cpp
editor/libeditor/nsHTMLObjectResizer.cpp
editor/libeditor/nsHTMLObjectResizer.h
editor/libeditor/nsHTMLURIRefObject.cpp
editor/libeditor/nsHTMLURIRefObject.h
editor/libeditor/nsTableEditor.cpp
editor/libeditor/nsWSRunObject.cpp
editor/libeditor/nsWSRunObject.h
editor/libeditor/tests/browserscope/lib/richtext/LICENSE
editor/libeditor/tests/browserscope/lib/richtext/README
editor/libeditor/tests/browserscope/lib/richtext/README.Mozilla
editor/libeditor/tests/browserscope/lib/richtext/currentStatus.js
editor/libeditor/tests/browserscope/lib/richtext/current_revision
editor/libeditor/tests/browserscope/lib/richtext/richtext/editable.html
editor/libeditor/tests/browserscope/lib/richtext/richtext/js/range.js
editor/libeditor/tests/browserscope/lib/richtext/richtext/richtext.html
editor/libeditor/tests/browserscope/lib/richtext/update_from_upstream
editor/libeditor/tests/browserscope/lib/richtext2/LICENSE
editor/libeditor/tests/browserscope/lib/richtext2/README
editor/libeditor/tests/browserscope/lib/richtext2/README.Mozilla
editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js
editor/libeditor/tests/browserscope/lib/richtext2/current_revision
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/__init__.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/common.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/handlers.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/common.css
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable-body.html
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable-dM.html
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable-div.html
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable.css
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/canonicalize.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/compare.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/output.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/pad.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range-bootstrap.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/run.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/units.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/variables.js
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/templates/output.html
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/templates/richtext2.html
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/__init__.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/apply.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/applyCSS.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/change.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/changeCSS.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/delete.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/forwarddelete.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/insert.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryEnabled.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryIndeterm.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryState.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/querySupported.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryValue.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/selection.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/unapply.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/unapplyCSS.py
editor/libeditor/tests/browserscope/lib/richtext2/richtext2/unittestexample.html
editor/libeditor/tests/browserscope/lib/richtext2/update_from_upstream
editor/libeditor/tests/browserscope/mochitest.ini
editor/libeditor/tests/browserscope/test_richtext.html
editor/libeditor/tests/browserscope/test_richtext2.html
editor/libeditor/tests/chrome.ini
editor/libeditor/tests/data/cfhtml-chromium.txt
editor/libeditor/tests/data/cfhtml-firefox.txt
editor/libeditor/tests/data/cfhtml-ie.txt
editor/libeditor/tests/data/cfhtml-nocontext.txt
editor/libeditor/tests/data/cfhtml-ooo.txt
editor/libeditor/tests/file_bug549262.html
editor/libeditor/tests/file_bug674770-1.html
editor/libeditor/tests/file_select_all_without_body.html
editor/libeditor/tests/green.png
editor/libeditor/tests/mochitest.ini
editor/libeditor/tests/moz.build
editor/libeditor/tests/test_CF_HTML_clipboard.html
editor/libeditor/tests/test_bug200416.html
editor/libeditor/tests/test_bug289384.html
editor/libeditor/tests/test_bug290026.html
editor/libeditor/tests/test_bug291780.html
editor/libeditor/tests/test_bug316447.html
editor/libeditor/tests/test_bug332636.html
editor/libeditor/tests/test_bug332636.html^headers^
editor/libeditor/tests/test_bug366682.html
editor/libeditor/tests/test_bug372345.html
editor/libeditor/tests/test_bug404320.html
editor/libeditor/tests/test_bug410986.html
editor/libeditor/tests/test_bug414526.html
editor/libeditor/tests/test_bug417418.html
editor/libeditor/tests/test_bug432225.html
editor/libeditor/tests/test_bug439808.html
editor/libeditor/tests/test_bug442186.html
editor/libeditor/tests/test_bug449243.html
editor/libeditor/tests/test_bug455992.html
editor/libeditor/tests/test_bug456244.html
editor/libeditor/tests/test_bug460740.html
editor/libeditor/tests/test_bug468353.html
editor/libeditor/tests/test_bug478725.html
editor/libeditor/tests/test_bug480647.html
editor/libeditor/tests/test_bug480972.html
editor/libeditor/tests/test_bug484181.html
editor/libeditor/tests/test_bug487524.html
editor/libeditor/tests/test_bug489202.xul
editor/libeditor/tests/test_bug490879.xul
editor/libeditor/tests/test_bug520189.html
editor/libeditor/tests/test_bug525389.html
editor/libeditor/tests/test_bug537046.html
editor/libeditor/tests/test_bug549262.html
editor/libeditor/tests/test_bug550434.html
editor/libeditor/tests/test_bug551704.html
editor/libeditor/tests/test_bug552782.html
editor/libeditor/tests/test_bug570144.html
editor/libeditor/tests/test_bug578771.html
editor/libeditor/tests/test_bug587461.html
editor/libeditor/tests/test_bug592592.html
editor/libeditor/tests/test_bug597784.html
editor/libeditor/tests/test_bug599322.html
editor/libeditor/tests/test_bug607584.html
editor/libeditor/tests/test_bug607584.xul
editor/libeditor/tests/test_bug611182.html
editor/libeditor/tests/test_bug612128.html
editor/libeditor/tests/test_bug612447.html
editor/libeditor/tests/test_bug616590.xul
editor/libeditor/tests/test_bug620906.html
editor/libeditor/tests/test_bug622371.html
editor/libeditor/tests/test_bug629845.html
editor/libeditor/tests/test_bug635636.html
editor/libeditor/tests/test_bug640321.html
editor/libeditor/tests/test_bug668599.html
editor/libeditor/tests/test_bug674770-1.html
editor/libeditor/tests/test_bug674770-2.html
editor/libeditor/tests/test_bug674861.html
editor/libeditor/tests/test_bug676401.html
editor/libeditor/tests/test_bug677752.html
editor/libeditor/tests/test_bug686203.html
editor/libeditor/tests/test_bug697842.html
editor/libeditor/tests/test_bug725069.html
editor/libeditor/tests/test_bug735059.html
editor/libeditor/tests/test_bug738366.html
editor/libeditor/tests/test_bug757371.html
editor/libeditor/tests/test_bug767684.html
editor/libeditor/tests/test_bug780035.html
editor/libeditor/tests/test_bug780908.xul
editor/libeditor/tests/test_bug787432.html
editor/libeditor/tests/test_bug790475.html
editor/libeditor/tests/test_bug796839.html
editor/libeditor/tests/test_bug832025.html
editor/libeditor/tests/test_bug857487.html
editor/libeditor/tests/test_bug966155.html
editor/libeditor/tests/test_bug966552.html
editor/libeditor/tests/test_bug998188.html
editor/libeditor/tests/test_contenteditable_focus.html
editor/libeditor/tests/test_contenteditable_text_input_handling.html
editor/libeditor/tests/test_dom_input_event_on_htmleditor.html
editor/libeditor/tests/test_htmleditor_keyevent_handling.html
editor/libeditor/tests/test_keypress_untrusted_event.html
editor/libeditor/tests/test_root_element_replacement.html
editor/libeditor/tests/test_select_all_without_body.html
editor/libeditor/tests/test_spellcheck_pref.html
editor/libeditor/text/nsPlaintextEditor.cpp
layout/build/moz.build
parser/htmlparser/public/nsHTMLTagList.h
--- a/editor/crashtests.list
+++ b/editor/crashtests.list
@@ -1,9 +1,8 @@
 # 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/.
 
-include libeditor/html/crashtests/crashtests.list
 include libeditor/crashtests/crashtests.list
 include libeditor/text/crashtests/crashtests.list
 include composer/crashtests/crashtests.list
 include txmgr/tests/crashtests/crashtests.list
rename from editor/libeditor/html/TextEditorTest.cpp
rename to editor/libeditor/TextEditorTest.cpp
rename from editor/libeditor/html/TextEditorTest.h
rename to editor/libeditor/TextEditorTest.h
rename from editor/libeditor/html/TypeInState.cpp
rename to editor/libeditor/TypeInState.cpp
rename from editor/libeditor/html/TypeInState.h
rename to editor/libeditor/TypeInState.h
rename from editor/libeditor/html/crashtests/336081-1.xhtml
rename to editor/libeditor/crashtests/336081-1.xhtml
rename from editor/libeditor/html/crashtests/382778-1.html
rename to editor/libeditor/crashtests/382778-1.html
rename from editor/libeditor/html/crashtests/407074-1.html
rename to editor/libeditor/crashtests/407074-1.html
rename from editor/libeditor/html/crashtests/407277-1.html
rename to editor/libeditor/crashtests/407277-1.html
rename from editor/libeditor/html/crashtests/414178-1.html
rename to editor/libeditor/crashtests/414178-1.html
rename from editor/libeditor/html/crashtests/418923-1.html
rename to editor/libeditor/crashtests/418923-1.html
rename from editor/libeditor/html/crashtests/420439.html
rename to editor/libeditor/crashtests/420439.html
rename from editor/libeditor/html/crashtests/428489-1.html
rename to editor/libeditor/crashtests/428489-1.html
rename from editor/libeditor/html/crashtests/431086-1.xhtml
rename to editor/libeditor/crashtests/431086-1.xhtml
rename from editor/libeditor/html/crashtests/448329-1.html
rename to editor/libeditor/crashtests/448329-1.html
rename from editor/libeditor/html/crashtests/448329-2.html
rename to editor/libeditor/crashtests/448329-2.html
rename from editor/libeditor/html/crashtests/448329-3.html
rename to editor/libeditor/crashtests/448329-3.html
rename from editor/libeditor/html/crashtests/456727-1.html
rename to editor/libeditor/crashtests/456727-1.html
rename from editor/libeditor/html/crashtests/456727-2.html
rename to editor/libeditor/crashtests/456727-2.html
rename from editor/libeditor/html/crashtests/467647-1.html
rename to editor/libeditor/crashtests/467647-1.html
rename from editor/libeditor/html/crashtests/499844-1.html
rename to editor/libeditor/crashtests/499844-1.html
rename from editor/libeditor/html/crashtests/503709-1.xhtml
rename to editor/libeditor/crashtests/503709-1.xhtml
rename from editor/libeditor/html/crashtests/513375-1.xhtml
rename to editor/libeditor/crashtests/513375-1.xhtml
rename from editor/libeditor/html/crashtests/535632-1.xhtml
rename to editor/libeditor/crashtests/535632-1.xhtml
rename from editor/libeditor/html/crashtests/574558-1.xhtml
rename to editor/libeditor/crashtests/574558-1.xhtml
rename from editor/libeditor/html/crashtests/582138-1.xhtml
rename to editor/libeditor/crashtests/582138-1.xhtml
rename from editor/libeditor/html/crashtests/612565-1.html
rename to editor/libeditor/crashtests/612565-1.html
rename from editor/libeditor/html/crashtests/615015-1.html
rename to editor/libeditor/crashtests/615015-1.html
rename from editor/libeditor/html/crashtests/615450-1.html
rename to editor/libeditor/crashtests/615450-1.html
rename from editor/libeditor/html/crashtests/639736-1.xhtml
rename to editor/libeditor/crashtests/639736-1.xhtml
rename from editor/libeditor/html/crashtests/643786-1.html
rename to editor/libeditor/crashtests/643786-1.html
rename from editor/libeditor/html/crashtests/682650-1.html
rename to editor/libeditor/crashtests/682650-1.html
rename from editor/libeditor/html/crashtests/716456-1.html
rename to editor/libeditor/crashtests/716456-1.html
rename from editor/libeditor/html/crashtests/759748.html
rename to editor/libeditor/crashtests/759748.html
rename from editor/libeditor/html/crashtests/761861.html
rename to editor/libeditor/crashtests/761861.html
rename from editor/libeditor/html/crashtests/766305.html
rename to editor/libeditor/crashtests/766305.html
rename from editor/libeditor/html/crashtests/766387.html
rename to editor/libeditor/crashtests/766387.html
rename from editor/libeditor/html/crashtests/766795.html
rename to editor/libeditor/crashtests/766795.html
rename from editor/libeditor/html/crashtests/767169.html
rename to editor/libeditor/crashtests/767169.html
rename from editor/libeditor/html/crashtests/768748.html
rename to editor/libeditor/crashtests/768748.html
rename from editor/libeditor/html/crashtests/769008-1.html
rename to editor/libeditor/crashtests/769008-1.html
rename from editor/libeditor/html/crashtests/769967.xhtml
rename to editor/libeditor/crashtests/769967.xhtml
rename from editor/libeditor/html/crashtests/793866.html
rename to editor/libeditor/crashtests/793866.html
--- a/editor/libeditor/crashtests/crashtests.list
+++ b/editor/libeditor/crashtests/crashtests.list
@@ -1,20 +1,58 @@
+load 336081-1.xhtml
 load 336104.html
 load 382527-1.html
+load 382778-1.html
 load 402172-1.html
+load 407074-1.html
 load 407079-1.html
 load 407256-1.html
+load 407277-1.html
+load 414178-1.html
+load 418923-1.html
+asserts(0-16) load 420439.html # Bug 439258
+load 428489-1.html
 load 430624-1.html
+asserts(0-16) load 431086-1.xhtml # Bug 439258
+load 448329-1.html
+load 448329-2.html
+load 448329-3.html
+load 456727-1.html
+load 456727-2.html
 load 459613.html
+needs-focus asserts(0-1) load 467647-1.html # bug 414178
 load 475132-1.xhtml
+load 499844-1.html
+load 503709-1.xhtml
+load 513375-1.xhtml
+load 535632-1.xhtml
+load 574558-1.xhtml
+load 582138-1.xhtml
+load 612565-1.html
+asserts(0-6) load 615015-1.html # Bug 439258
+load 615450-1.html
 load 633709.xhtml
 load 636074-1.html
+load 639736-1.xhtml
+load 643786-1.html
+load 682650-1.html
 load 713427-1.html
 load 713427-2.xhtml
+asserts(0-1) load 716456-1.html
+load 759748.html
+load 761861.html
 load 762183.html
+load 769008-1.html
+load 766305.html
 load 766360.html
+load 766387.html
 load 766413.html
 load 766845.xhtml
+load 766795.html
+load 767169.html
+load 769967.xhtml
+load 768748.html
 load 768765.html
 needs-focus load 771749.html
 load 772282.html
 load 776323.html
+needs-focus load 793866.html
deleted file mode 100644
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ /dev/null
@@ -1,38 +0,0 @@
-load 336081-1.xhtml
-load 382778-1.html
-load 407074-1.html
-load 407277-1.html
-load 414178-1.html
-load 418923-1.html
-asserts(0-16) load 420439.html # Bug 439258
-load 428489-1.html
-asserts(0-16) load 431086-1.xhtml # Bug 439258
-load 448329-1.html
-load 448329-2.html
-load 448329-3.html
-load 456727-1.html
-load 456727-2.html
-needs-focus asserts(0-1) load 467647-1.html # bug 414178
-load 499844-1.html
-load 503709-1.xhtml
-load 513375-1.xhtml
-load 535632-1.xhtml
-load 574558-1.xhtml
-load 582138-1.xhtml
-load 612565-1.html
-asserts(0-6) load 615015-1.html # Bug 439258
-load 615450-1.html
-load 639736-1.xhtml
-load 643786-1.html
-load 682650-1.html
-asserts(0-1) load 716456-1.html
-load 759748.html
-load 761861.html
-load 769008-1.html
-load 766305.html
-load 766387.html
-load 766795.html
-load 767169.html
-load 769967.xhtml
-load 768748.html
-needs-focus load 793866.html
deleted file mode 100644
--- a/editor/libeditor/html/moz.build
+++ /dev/null
@@ -1,42 +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/.
-
-TEST_DIRS += ['tests']
-
-UNIFIED_SOURCES += [
-    'nsEditProperty.cpp',
-    'nsHTMLAbsPosition.cpp',
-    'nsHTMLAnonymousUtils.cpp',
-    'nsHTMLCSSUtils.cpp',
-    'nsHTMLDataTransfer.cpp',
-    'nsHTMLEditor.cpp',
-    'nsHTMLEditorEventListener.cpp',
-    'nsHTMLEditorStyle.cpp',
-    'nsHTMLEditRules.cpp',
-    'nsHTMLEditUtils.cpp',
-    'nsHTMLInlineTableEditor.cpp',
-    'nsHTMLObjectResizer.cpp',
-    'nsHTMLURIRefObject.cpp',
-    'nsTableEditor.cpp',
-    'nsWSRunObject.cpp',
-    'TextEditorTest.cpp',
-    'TypeInState.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '..',
-    '../text',
-    '/content/base/src',
-    '/editor/txmgr',
-    '/layout/generic',
-    '/layout/style',
-    '/layout/tables',
-    '/layout/xul',
-]
-
-FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/editor/libeditor/html/tests/chrome.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-support-files = green.png
-
-[test_bug366682.html]
-[test_bug489202.xul]
-[test_bug490879.xul]
-[test_bug607584.xul]
-[test_bug616590.xul]
-[test_bug635636.html]
-[test_bug780908.xul]
-[test_contenteditable_text_input_handling.html]
-[test_htmleditor_keyevent_handling.html]
deleted file mode 100644
--- a/editor/libeditor/html/tests/mochitest.ini
+++ /dev/null
@@ -1,110 +0,0 @@
-[DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
-support-files =
-  data/cfhtml-chromium.txt
-  data/cfhtml-firefox.txt
-  data/cfhtml-ie.txt
-  data/cfhtml-ooo.txt
-  data/cfhtml-nocontext.txt
-  file_bug549262.html
-  file_bug674770-1.html
-  file_select_all_without_body.html
-  green.png
-
-[test_bug200416.html]
-[test_bug289384.html]
-skip-if = os != "mac"
-[test_bug290026.html]
-[test_bug291780.html]
-[test_bug316447.html]
-[test_bug332636.html]
-support-files = test_bug332636.html^headers^
-[test_bug372345.html]
-skip-if = toolkit == 'android'
-[test_bug404320.html]
-[test_bug410986.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug414526.html]
-[test_bug417418.html]
-[test_bug432225.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug439808.html]
-[test_bug442186.html]
-[test_bug449243.html]
-[test_bug455992.html]
-[test_bug456244.html]
-[test_bug460740.html]
-[test_bug468353.html]
-[test_bug478725.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug480647.html]
-[test_bug480972.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug484181.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug487524.html]
-[test_bug520189.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug525389.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug537046.html]
-[test_bug549262.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug550434.html]
-[test_bug551704.html]
-[test_bug552782.html]
-[test_bug570144.html]
-[test_bug578771.html]
-[test_bug587461.html]
-[test_bug592592.html]
-[test_bug597784.html]
-[test_bug599322.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug607584.html]
-[test_bug611182.html]
-skip-if = toolkit == 'android'
-[test_bug612128.html]
-[test_bug612447.html]
-[test_bug620906.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug622371.html]
-skip-if = toolkit == 'android' #bug 957797
-[test_bug629845.html]
-[test_bug640321.html]
-skip-if = e10s
-[test_bug668599.html]
-[test_bug674770-1.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug674770-2.html]
-skip-if = toolkit == 'android' || e10s
-[test_bug674861.html]
-[test_bug676401.html]
-[test_bug677752.html]
-[test_bug686203.html]
-[test_bug697842.html]
-[test_bug725069.html]
-[test_bug735059.html]
-[test_bug738366.html]
-[test_bug757371.html]
-[test_bug767684.html]
-[test_bug780035.html]
-[test_bug787432.html]
-[test_bug790475.html]
-[test_bug796839.html]
-[test_bug832025.html]
-[test_bug857487.html]
-[test_bug966155.html]
-skip-if = os != "win"
-[test_bug966552.html]
-skip-if = os != "win"
-[test_bug998188.html]
-[test_CF_HTML_clipboard.html]
-[test_contenteditable_focus.html]
-[test_dom_input_event_on_htmleditor.html]
-skip-if = toolkit == 'android' # bug 1054087
-[test_keypress_untrusted_event.html]
-[test_root_element_replacement.html]
-[test_select_all_without_body.html]
-skip-if = e10s
-[test_spellcheck_pref.html]
-skip-if = toolkit == 'android'
deleted file mode 100644
--- a/editor/libeditor/html/tests/moz.build
+++ /dev/null
@@ -1,11 +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/.
-
-MOCHITEST_MANIFESTS += ['browserscope/mochitest.ini', 
-                        'mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -1,15 +1,15 @@
 # -*- 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/.
 
-DIRS += ['text', 'html']
+DIRS += ['text']
 
 TEST_DIRS += ['tests']
 
 UNIFIED_SOURCES += [
     'ChangeAttributeTxn.cpp',
     'ChangeCSSInlineStyleTxn.cpp',
     'CreateElementTxn.cpp',
     'DeleteNodeTxn.cpp',
@@ -21,26 +21,46 @@ UNIFIED_SOURCES += [
     'InsertElementTxn.cpp',
     'InsertTextTxn.cpp',
     'JoinElementTxn.cpp',
     'nsEditor.cpp',
     'nsEditorCommands.cpp',
     'nsEditorController.cpp',
     'nsEditorEventListener.cpp',
     'nsEditorUtils.cpp',
+    'nsEditProperty.cpp',
+    'nsHTMLAbsPosition.cpp',
+    'nsHTMLAnonymousUtils.cpp',
+    'nsHTMLCSSUtils.cpp',
+    'nsHTMLDataTransfer.cpp',
+    'nsHTMLEditor.cpp',
+    'nsHTMLEditorEventListener.cpp',
+    'nsHTMLEditorStyle.cpp',
+    'nsHTMLEditRules.cpp',
+    'nsHTMLEditUtils.cpp',
+    'nsHTMLInlineTableEditor.cpp',
+    'nsHTMLObjectResizer.cpp',
+    'nsHTMLURIRefObject.cpp',
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
+    'nsTableEditor.cpp',
+    'nsWSRunObject.cpp',
     'PlaceholderTxn.cpp',
     'SetDocTitleTxn.cpp',
     'SplitElementTxn.cpp',
+    'TextEditorTest.cpp',
+    'TypeInState.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/editor/txmgr',
     '/extensions/spellcheck/src',
+    '/layout/generic',
     '/layout/style',
+    '/layout/tables',
+    '/layout/xul',
     'text',
 ]
 
 FINAL_LIBRARY = 'xul'
rename from editor/libeditor/html/nsEditProperty.cpp
rename to editor/libeditor/nsEditProperty.cpp
--- a/editor/libeditor/nsEditor.cpp
+++ b/editor/libeditor/nsEditor.cpp
@@ -4751,17 +4751,17 @@ nsEditor::RemoveAttributeOrEquivalent(ns
   return RemoveAttribute(aElement, aAttribute);
 }
 
 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/html/tests/test_htmleditor_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
   // HandleKeyPressEvent()'s switch statement.
 
   WidgetKeyboardEvent* nativeKeyEvent =
     aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent();
   NS_ENSURE_TRUE(nativeKeyEvent, NS_ERROR_UNEXPECTED);
   NS_ASSERTION(nativeKeyEvent->message == NS_KEY_PRESS,
--- a/editor/libeditor/nsEditorEventListener.cpp
+++ b/editor/libeditor/nsEditorEventListener.cpp
@@ -355,16 +355,23 @@ nsEditorEventListener::HandleEvent(nsIDO
     return NS_OK;
   }
 
   return NS_OK;
 }
 
 #ifdef HANDLE_NATIVE_TEXT_DIRECTION_SWITCH
 #include <windows.h>
+// Undo the windows.h damage
+#undef GetMessage
+#undef CreateEvent
+#undef GetClassName
+#undef GetBinaryType
+#undef RemoveDirectory
+#undef SetProp
 
 namespace {
 
 // This function is borrowed from Chromium's ImeInput::IsCtrlShiftPressed
 bool IsCtrlShiftPressed(bool& isRTL)
 {
   BYTE keystate[256];
   if (!::GetKeyboardState(keystate)) {
rename from editor/libeditor/html/nsHTMLAbsPosition.cpp
rename to editor/libeditor/nsHTMLAbsPosition.cpp
rename from editor/libeditor/html/nsHTMLAnonymousUtils.cpp
rename to editor/libeditor/nsHTMLAnonymousUtils.cpp
rename from editor/libeditor/html/nsHTMLCSSUtils.cpp
rename to editor/libeditor/nsHTMLCSSUtils.cpp
rename from editor/libeditor/html/nsHTMLCSSUtils.h
rename to editor/libeditor/nsHTMLCSSUtils.h
rename from editor/libeditor/html/nsHTMLDataTransfer.cpp
rename to editor/libeditor/nsHTMLDataTransfer.cpp
rename from editor/libeditor/html/nsHTMLEditRules.cpp
rename to editor/libeditor/nsHTMLEditRules.cpp
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/nsHTMLEditRules.cpp
@@ -9128,17 +9128,17 @@ nsHTMLEditRules::RelativeChangeIndentati
     return NS_OK;
   }
 
   NS_ENSURE_STATE(mHTMLEditor);
   mHTMLEditor->mHTMLCSSUtils->RemoveCSSProperty(element, marginProperty, value, false);
 
   // remove unnecessary DIV blocks:
   // we could skip this section but that would cause a FAIL in
-  // editor/libeditor/html/tests/browserscope/richtext.html, which expects
+  // editor/libeditor/tests/browserscope/richtext.html, which expects
   // to unapply a CSS "indent" (<div style="margin-left: 40px;">) by
   // removing the DIV container instead of just removing the CSS property.
   nsCOMPtr<dom::Element> node = do_QueryInterface(aNode);
   if (!node || !node->IsHTML(nsGkAtoms::div) ||
       !mHTMLEditor ||
       node == mHTMLEditor->GetActiveEditingHost() ||
       !mHTMLEditor->IsDescendantOfEditorRoot(node) ||
       nsHTMLEditor::HasAttributes(node)) {
rename from editor/libeditor/html/nsHTMLEditRules.h
rename to editor/libeditor/nsHTMLEditRules.h
--- a/editor/libeditor/html/nsHTMLEditRules.h
+++ b/editor/libeditor/nsHTMLEditRules.h
@@ -260,17 +260,17 @@ protected:
   nsresult PromoteRange(nsIDOMRange *inRange,
                         EditAction inOperationType);
   nsresult GetNodesForOperation(nsCOMArray<nsIDOMRange>& inArrayOfRanges, 
                                 nsCOMArray<nsIDOMNode>& outArrayOfNodes, 
                                 EditAction inOperationType,
                                 bool aDontTouchContent=false);
   nsresult GetChildNodesForOperation(nsIDOMNode *inNode, 
                                      nsCOMArray<nsIDOMNode>& outArrayOfNodes);
-  nsresult GetNodesFromPoint(DOMPoint point,
+  nsresult GetNodesFromPoint(::DOMPoint point,
                              EditAction operation,
                              nsCOMArray<nsIDOMNode>& arrayOfNodes,
                              bool dontTouchContent);
   nsresult GetNodesFromSelection(nsISelection *selection,
                                  EditAction operation,
                                  nsCOMArray<nsIDOMNode>& arrayOfNodes,
                                  bool aDontTouchContent=false);
   nsresult GetListActionNodes(nsCOMArray<nsIDOMNode> &outArrayOfNodes, bool aEntireList, bool aDontTouchContent=false);
rename from editor/libeditor/html/nsHTMLEditUtils.cpp
rename to editor/libeditor/nsHTMLEditUtils.cpp
rename from editor/libeditor/html/nsHTMLEditUtils.h
rename to editor/libeditor/nsHTMLEditUtils.h
rename from editor/libeditor/html/nsHTMLEditor.cpp
rename to editor/libeditor/nsHTMLEditor.cpp
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/nsHTMLEditor.cpp
@@ -590,17 +590,17 @@ nsHTMLEditor::BeginningOfDocument()
   }
   return selection->Collapse(selNode, selOffset);
 }
 
 nsresult
 nsHTMLEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
 {
   // NOTE: When you change this method, you should also change:
-  //   * editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html
+  //   * editor/libeditor/tests/test_htmleditor_keyevent_handling.html
 
   if (IsReadonly() || IsDisabled()) {
     // When we're not editable, the events are handled on nsEditor, so, we can
     // bypass nsPlaintextEditor.
     return nsEditor::HandleKeyPressEvent(aKeyEvent);
   }
 
   WidgetKeyboardEvent* nativeKeyEvent =
rename from editor/libeditor/html/nsHTMLEditor.h
rename to editor/libeditor/nsHTMLEditor.h
rename from editor/libeditor/html/nsHTMLEditorEventListener.cpp
rename to editor/libeditor/nsHTMLEditorEventListener.cpp
rename from editor/libeditor/html/nsHTMLEditorEventListener.h
rename to editor/libeditor/nsHTMLEditorEventListener.h
rename from editor/libeditor/html/nsHTMLEditorStyle.cpp
rename to editor/libeditor/nsHTMLEditorStyle.cpp
rename from editor/libeditor/html/nsHTMLInlineTableEditor.cpp
rename to editor/libeditor/nsHTMLInlineTableEditor.cpp
rename from editor/libeditor/html/nsHTMLObjectResizer.cpp
rename to editor/libeditor/nsHTMLObjectResizer.cpp
rename from editor/libeditor/html/nsHTMLObjectResizer.h
rename to editor/libeditor/nsHTMLObjectResizer.h
rename from editor/libeditor/html/nsHTMLURIRefObject.cpp
rename to editor/libeditor/nsHTMLURIRefObject.cpp
rename from editor/libeditor/html/nsHTMLURIRefObject.h
rename to editor/libeditor/nsHTMLURIRefObject.h
rename from editor/libeditor/html/nsTableEditor.cpp
rename to editor/libeditor/nsTableEditor.cpp
rename from editor/libeditor/html/nsWSRunObject.cpp
rename to editor/libeditor/nsWSRunObject.cpp
rename from editor/libeditor/html/nsWSRunObject.h
rename to editor/libeditor/nsWSRunObject.h
rename from editor/libeditor/html/tests/browserscope/lib/richtext/LICENSE
rename to editor/libeditor/tests/browserscope/lib/richtext/LICENSE
rename from editor/libeditor/html/tests/browserscope/lib/richtext/README
rename to editor/libeditor/tests/browserscope/lib/richtext/README
rename from editor/libeditor/html/tests/browserscope/lib/richtext/README.Mozilla
rename to editor/libeditor/tests/browserscope/lib/richtext/README.Mozilla
rename from editor/libeditor/html/tests/browserscope/lib/richtext/currentStatus.js
rename to editor/libeditor/tests/browserscope/lib/richtext/currentStatus.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext/current_revision
rename to editor/libeditor/tests/browserscope/lib/richtext/current_revision
rename from editor/libeditor/html/tests/browserscope/lib/richtext/richtext/editable.html
rename to editor/libeditor/tests/browserscope/lib/richtext/richtext/editable.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext/richtext/js/range.js
rename to editor/libeditor/tests/browserscope/lib/richtext/richtext/js/range.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext/richtext/richtext.html
rename to editor/libeditor/tests/browserscope/lib/richtext/richtext/richtext.html
--- a/editor/libeditor/html/tests/browserscope/lib/richtext/richtext/richtext.html
+++ b/editor/libeditor/tests/browserscope/lib/richtext/richtext/richtext.html
@@ -107,17 +107,17 @@
       this.compare = function(other) {
         return this.size == other.size;
       }
       this.toString = function() {
         return String(this.size);
       }
     }
 
-    var IMAGE_URI = '/tests/editor/libeditor/html/tests/green.png';
+    var IMAGE_URI = '/tests/editor/libeditor/tests/green.png';
 
     var APPLY_TESTS = {
       'backcolor' : {
         opt_arg: '#FF0000',
         styleWithCSS: 'background-color'},
       'bold' : {
         opt_arg: null,
         styleWithCSS: 'font-weight'},
rename from editor/libeditor/html/tests/browserscope/lib/richtext/update_from_upstream
rename to editor/libeditor/tests/browserscope/lib/richtext/update_from_upstream
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/LICENSE
rename to editor/libeditor/tests/browserscope/lib/richtext2/LICENSE
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/README
rename to editor/libeditor/tests/browserscope/lib/richtext2/README
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/README.Mozilla
rename to editor/libeditor/tests/browserscope/lib/richtext2/README.Mozilla
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/current_revision
rename to editor/libeditor/tests/browserscope/lib/richtext2/current_revision
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/__init__.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/__init__.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/common.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/common.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/handlers.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/handlers.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/common.css
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/common.css
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable-body.html
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable-body.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable-dM.html
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable-dM.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable-div.html
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable-div.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/editable.css
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/editable.css
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/canonicalize.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/canonicalize.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/compare.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/compare.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/output.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/output.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/pad.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/pad.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/range-bootstrap.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range-bootstrap.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/range.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/run.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/units.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/units.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/variables.js
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/variables.js
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/templates/output.html
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/templates/output.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/templates/richtext2.html
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/templates/richtext2.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/__init__.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/__init__.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/apply.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/apply.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/applyCSS.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/applyCSS.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/change.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/change.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/changeCSS.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/changeCSS.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/delete.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/delete.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/forwarddelete.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/forwarddelete.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/insert.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryEnabled.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryEnabled.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryIndeterm.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryIndeterm.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryState.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryState.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/querySupported.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/querySupported.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/queryValue.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/queryValue.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/selection.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/selection.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/unapply.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/unapply.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/unapplyCSS.py
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/tests/unapplyCSS.py
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/unittestexample.html
rename to editor/libeditor/tests/browserscope/lib/richtext2/richtext2/unittestexample.html
rename from editor/libeditor/html/tests/browserscope/lib/richtext2/update_from_upstream
rename to editor/libeditor/tests/browserscope/lib/richtext2/update_from_upstream
rename from editor/libeditor/html/tests/browserscope/mochitest.ini
rename to editor/libeditor/tests/browserscope/mochitest.ini
rename from editor/libeditor/html/tests/browserscope/test_richtext.html
rename to editor/libeditor/tests/browserscope/test_richtext.html
rename from editor/libeditor/html/tests/browserscope/test_richtext2.html
rename to editor/libeditor/tests/browserscope/test_richtext2.html
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -1,10 +1,20 @@
 [DEFAULT]
+support-files = green.png
 
 [test_bug46555.html]
+[test_bug366682.html]
+[test_bug489202.xul]
+[test_bug490879.xul]
 [test_bug599983.xul]
 skip-if = buildapp == 'mulet'
+[test_bug607584.xul]
+[test_bug616590.xul]
+[test_bug635636.html]
 [test_bug646194.xul]
+[test_bug780908.xul]
 [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]
rename from editor/libeditor/html/tests/data/cfhtml-chromium.txt
rename to editor/libeditor/tests/data/cfhtml-chromium.txt
rename from editor/libeditor/html/tests/data/cfhtml-firefox.txt
rename to editor/libeditor/tests/data/cfhtml-firefox.txt
rename from editor/libeditor/html/tests/data/cfhtml-ie.txt
rename to editor/libeditor/tests/data/cfhtml-ie.txt
rename from editor/libeditor/html/tests/data/cfhtml-nocontext.txt
rename to editor/libeditor/tests/data/cfhtml-nocontext.txt
rename from editor/libeditor/html/tests/data/cfhtml-ooo.txt
rename to editor/libeditor/tests/data/cfhtml-ooo.txt
rename from editor/libeditor/html/tests/file_bug549262.html
rename to editor/libeditor/tests/file_bug549262.html
rename from editor/libeditor/html/tests/file_bug674770-1.html
rename to editor/libeditor/tests/file_bug674770-1.html
rename from editor/libeditor/html/tests/file_select_all_without_body.html
rename to editor/libeditor/tests/file_select_all_without_body.html
rename from editor/libeditor/html/tests/green.png
rename to editor/libeditor/tests/green.png
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -1,15 +1,122 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || buildapp == 'mulet'
-support-files = file_bug586662.html
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
+support-files =
+  data/cfhtml-chromium.txt
+  data/cfhtml-firefox.txt
+  data/cfhtml-ie.txt
+  data/cfhtml-ooo.txt
+  data/cfhtml-nocontext.txt
+  file_bug549262.html
+  file_bug586662.html
+  file_bug674770-1.html
+  file_select_all_without_body.html
+  green.png
 
+[test_bug200416.html]
+[test_bug289384.html]
+skip-if = os != "mac"
+[test_bug290026.html]
+[test_bug291780.html]
+[test_bug316447.html]
+[test_bug332636.html]
+support-files = test_bug332636.html^headers^
+[test_bug372345.html]
+skip-if = toolkit == 'android'
+[test_bug404320.html]
 [test_bug408231.html]
 skip-if = toolkit == 'android'
+[test_bug410986.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug414526.html]
+[test_bug417418.html]
+[test_bug432225.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug439808.html]
+[test_bug442186.html]
+[test_bug449243.html]
+[test_bug455992.html]
+[test_bug456244.html]
+[test_bug460740.html]
+[test_bug468353.html]
+[test_bug478725.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug480647.html]
+[test_bug480972.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug484181.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug487524.html]
 [test_bug502673.html]
 [test_bug514156.html]
+[test_bug520189.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug525389.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug537046.html]
+[test_bug549262.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug550434.html]
+[test_bug551704.html]
+[test_bug552782.html]
 [test_bug567213.html]
+[test_bug570144.html]
+[test_bug578771.html]
 [test_bug586662.html]
 skip-if = toolkit == 'android' || e10s
+[test_bug587461.html]
+[test_bug592592.html]
+[test_bug597784.html]
+[test_bug599322.html]
+skip-if = toolkit == 'android' || e10s
 [test_bug599983.html]
+[test_bug607584.html]
+[test_bug611182.html]
+skip-if = toolkit == 'android'
+[test_bug612128.html]
+[test_bug612447.html]
+[test_bug620906.html]
+skip-if = toolkit == 'android' #TIMED_OUT
+[test_bug622371.html]
+skip-if = toolkit == 'android' #bug 957797
+[test_bug629845.html]
+[test_bug640321.html]
+skip-if = e10s
+[test_bug668599.html]
+[test_bug674770-1.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug674770-2.html]
+skip-if = toolkit == 'android' || e10s
+[test_bug674861.html]
+[test_bug676401.html]
+[test_bug677752.html]
+[test_bug686203.html]
+[test_bug697842.html]
+[test_bug725069.html]
+[test_bug735059.html]
+[test_bug738366.html]
 [test_bug742261.html]
+[test_bug757371.html]
+[test_bug767684.html]
 [test_bug773262.html]
+[test_bug780035.html]
+[test_bug787432.html]
+[test_bug790475.html]
 [test_bug795785.html]
+[test_bug796839.html]
+[test_bug832025.html]
+[test_bug857487.html]
+[test_bug966155.html]
+skip-if = os != "win"
+[test_bug966552.html]
+skip-if = os != "win"
+[test_bug998188.html]
+[test_CF_HTML_clipboard.html]
+[test_contenteditable_focus.html]
+[test_dom_input_event_on_htmleditor.html]
+skip-if = toolkit == 'android' # bug 1054087
+[test_keypress_untrusted_event.html]
+[test_root_element_replacement.html]
+[test_select_all_without_body.html]
+skip-if = e10s
+[test_spellcheck_pref.html]
+skip-if = toolkit == 'android'
--- a/editor/libeditor/tests/moz.build
+++ b/editor/libeditor/tests/moz.build
@@ -1,10 +1,11 @@
 # -*- 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/.
 
-MOCHITEST_MANIFESTS += ['mochitest.ini']
+MOCHITEST_MANIFESTS += ['browserscope/mochitest.ini',
+                        'mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
rename from editor/libeditor/html/tests/test_CF_HTML_clipboard.html
rename to editor/libeditor/tests/test_CF_HTML_clipboard.html
rename from editor/libeditor/html/tests/test_bug200416.html
rename to editor/libeditor/tests/test_bug200416.html
rename from editor/libeditor/html/tests/test_bug289384.html
rename to editor/libeditor/tests/test_bug289384.html
rename from editor/libeditor/html/tests/test_bug290026.html
rename to editor/libeditor/tests/test_bug290026.html
rename from editor/libeditor/html/tests/test_bug291780.html
rename to editor/libeditor/tests/test_bug291780.html
rename from editor/libeditor/html/tests/test_bug316447.html
rename to editor/libeditor/tests/test_bug316447.html
rename from editor/libeditor/html/tests/test_bug332636.html
rename to editor/libeditor/tests/test_bug332636.html
rename from editor/libeditor/html/tests/test_bug332636.html^headers^
rename to editor/libeditor/tests/test_bug332636.html^headers^
rename from editor/libeditor/html/tests/test_bug366682.html
rename to editor/libeditor/tests/test_bug366682.html
rename from editor/libeditor/html/tests/test_bug372345.html
rename to editor/libeditor/tests/test_bug372345.html
rename from editor/libeditor/html/tests/test_bug404320.html
rename to editor/libeditor/tests/test_bug404320.html
rename from editor/libeditor/html/tests/test_bug410986.html
rename to editor/libeditor/tests/test_bug410986.html
rename from editor/libeditor/html/tests/test_bug414526.html
rename to editor/libeditor/tests/test_bug414526.html
rename from editor/libeditor/html/tests/test_bug417418.html
rename to editor/libeditor/tests/test_bug417418.html
rename from editor/libeditor/html/tests/test_bug432225.html
rename to editor/libeditor/tests/test_bug432225.html
rename from editor/libeditor/html/tests/test_bug439808.html
rename to editor/libeditor/tests/test_bug439808.html
rename from editor/libeditor/html/tests/test_bug442186.html
rename to editor/libeditor/tests/test_bug442186.html
rename from editor/libeditor/html/tests/test_bug449243.html
rename to editor/libeditor/tests/test_bug449243.html
rename from editor/libeditor/html/tests/test_bug455992.html
rename to editor/libeditor/tests/test_bug455992.html
rename from editor/libeditor/html/tests/test_bug456244.html
rename to editor/libeditor/tests/test_bug456244.html
rename from editor/libeditor/html/tests/test_bug460740.html
rename to editor/libeditor/tests/test_bug460740.html
rename from editor/libeditor/html/tests/test_bug468353.html
rename to editor/libeditor/tests/test_bug468353.html
rename from editor/libeditor/html/tests/test_bug478725.html
rename to editor/libeditor/tests/test_bug478725.html
rename from editor/libeditor/html/tests/test_bug480647.html
rename to editor/libeditor/tests/test_bug480647.html
rename from editor/libeditor/html/tests/test_bug480972.html
rename to editor/libeditor/tests/test_bug480972.html
rename from editor/libeditor/html/tests/test_bug484181.html
rename to editor/libeditor/tests/test_bug484181.html
rename from editor/libeditor/html/tests/test_bug487524.html
rename to editor/libeditor/tests/test_bug487524.html
rename from editor/libeditor/html/tests/test_bug489202.xul
rename to editor/libeditor/tests/test_bug489202.xul
rename from editor/libeditor/html/tests/test_bug490879.xul
rename to editor/libeditor/tests/test_bug490879.xul
rename from editor/libeditor/html/tests/test_bug520189.html
rename to editor/libeditor/tests/test_bug520189.html
rename from editor/libeditor/html/tests/test_bug525389.html
rename to editor/libeditor/tests/test_bug525389.html
rename from editor/libeditor/html/tests/test_bug537046.html
rename to editor/libeditor/tests/test_bug537046.html
rename from editor/libeditor/html/tests/test_bug549262.html
rename to editor/libeditor/tests/test_bug549262.html
rename from editor/libeditor/html/tests/test_bug550434.html
rename to editor/libeditor/tests/test_bug550434.html
rename from editor/libeditor/html/tests/test_bug551704.html
rename to editor/libeditor/tests/test_bug551704.html
rename from editor/libeditor/html/tests/test_bug552782.html
rename to editor/libeditor/tests/test_bug552782.html
rename from editor/libeditor/html/tests/test_bug570144.html
rename to editor/libeditor/tests/test_bug570144.html
rename from editor/libeditor/html/tests/test_bug578771.html
rename to editor/libeditor/tests/test_bug578771.html
rename from editor/libeditor/html/tests/test_bug587461.html
rename to editor/libeditor/tests/test_bug587461.html
rename from editor/libeditor/html/tests/test_bug592592.html
rename to editor/libeditor/tests/test_bug592592.html
rename from editor/libeditor/html/tests/test_bug597784.html
rename to editor/libeditor/tests/test_bug597784.html
rename from editor/libeditor/html/tests/test_bug599322.html
rename to editor/libeditor/tests/test_bug599322.html
--- a/editor/libeditor/html/tests/test_bug599322.html
+++ b/editor/libeditor/tests/test_bug599322.html
@@ -8,17 +8,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=599322.patch">Mozilla Bug 599322.patch</a>
 <p id="display"></p>
 <div id="content">
-<div id="src">src<img src="/tests/editor/libeditor/html/tests/green.png"></div>
+<div id="src">src<img src="/tests/editor/libeditor/tests/green.png"></div>
 <iframe id="dst" src="javascript:;"></iframe>
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 599322.patch **/
 
 SimpleTest.waitForExplicitFinish();
rename from editor/libeditor/html/tests/test_bug607584.html
rename to editor/libeditor/tests/test_bug607584.html
rename from editor/libeditor/html/tests/test_bug607584.xul
rename to editor/libeditor/tests/test_bug607584.xul
rename from editor/libeditor/html/tests/test_bug611182.html
rename to editor/libeditor/tests/test_bug611182.html
rename from editor/libeditor/html/tests/test_bug612128.html
rename to editor/libeditor/tests/test_bug612128.html
rename from editor/libeditor/html/tests/test_bug612447.html
rename to editor/libeditor/tests/test_bug612447.html
rename from editor/libeditor/html/tests/test_bug616590.xul
rename to editor/libeditor/tests/test_bug616590.xul
rename from editor/libeditor/html/tests/test_bug620906.html
rename to editor/libeditor/tests/test_bug620906.html
rename from editor/libeditor/html/tests/test_bug622371.html
rename to editor/libeditor/tests/test_bug622371.html
rename from editor/libeditor/html/tests/test_bug629845.html
rename to editor/libeditor/tests/test_bug629845.html
rename from editor/libeditor/html/tests/test_bug635636.html
rename to editor/libeditor/tests/test_bug635636.html
rename from editor/libeditor/html/tests/test_bug640321.html
rename to editor/libeditor/tests/test_bug640321.html
rename from editor/libeditor/html/tests/test_bug668599.html
rename to editor/libeditor/tests/test_bug668599.html
rename from editor/libeditor/html/tests/test_bug674770-1.html
rename to editor/libeditor/tests/test_bug674770-1.html
rename from editor/libeditor/html/tests/test_bug674770-2.html
rename to editor/libeditor/tests/test_bug674770-2.html
rename from editor/libeditor/html/tests/test_bug674861.html
rename to editor/libeditor/tests/test_bug674861.html
rename from editor/libeditor/html/tests/test_bug676401.html
rename to editor/libeditor/tests/test_bug676401.html
rename from editor/libeditor/html/tests/test_bug677752.html
rename to editor/libeditor/tests/test_bug677752.html
rename from editor/libeditor/html/tests/test_bug686203.html
rename to editor/libeditor/tests/test_bug686203.html
rename from editor/libeditor/html/tests/test_bug697842.html
rename to editor/libeditor/tests/test_bug697842.html
rename from editor/libeditor/html/tests/test_bug725069.html
rename to editor/libeditor/tests/test_bug725069.html
rename from editor/libeditor/html/tests/test_bug735059.html
rename to editor/libeditor/tests/test_bug735059.html
rename from editor/libeditor/html/tests/test_bug738366.html
rename to editor/libeditor/tests/test_bug738366.html
rename from editor/libeditor/html/tests/test_bug757371.html
rename to editor/libeditor/tests/test_bug757371.html
rename from editor/libeditor/html/tests/test_bug767684.html
rename to editor/libeditor/tests/test_bug767684.html
rename from editor/libeditor/html/tests/test_bug780035.html
rename to editor/libeditor/tests/test_bug780035.html
rename from editor/libeditor/html/tests/test_bug780908.xul
rename to editor/libeditor/tests/test_bug780908.xul
rename from editor/libeditor/html/tests/test_bug787432.html
rename to editor/libeditor/tests/test_bug787432.html
rename from editor/libeditor/html/tests/test_bug790475.html
rename to editor/libeditor/tests/test_bug790475.html
rename from editor/libeditor/html/tests/test_bug796839.html
rename to editor/libeditor/tests/test_bug796839.html
rename from editor/libeditor/html/tests/test_bug832025.html
rename to editor/libeditor/tests/test_bug832025.html
rename from editor/libeditor/html/tests/test_bug857487.html
rename to editor/libeditor/tests/test_bug857487.html
rename from editor/libeditor/html/tests/test_bug966155.html
rename to editor/libeditor/tests/test_bug966155.html
rename from editor/libeditor/html/tests/test_bug966552.html
rename to editor/libeditor/tests/test_bug966552.html
rename from editor/libeditor/html/tests/test_bug998188.html
rename to editor/libeditor/tests/test_bug998188.html
rename from editor/libeditor/html/tests/test_contenteditable_focus.html
rename to editor/libeditor/tests/test_contenteditable_focus.html
rename from editor/libeditor/html/tests/test_contenteditable_text_input_handling.html
rename to editor/libeditor/tests/test_contenteditable_text_input_handling.html
rename from editor/libeditor/html/tests/test_dom_input_event_on_htmleditor.html
rename to editor/libeditor/tests/test_dom_input_event_on_htmleditor.html
rename from editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html
rename to editor/libeditor/tests/test_htmleditor_keyevent_handling.html
rename from editor/libeditor/html/tests/test_keypress_untrusted_event.html
rename to editor/libeditor/tests/test_keypress_untrusted_event.html
rename from editor/libeditor/html/tests/test_root_element_replacement.html
rename to editor/libeditor/tests/test_root_element_replacement.html
rename from editor/libeditor/html/tests/test_select_all_without_body.html
rename to editor/libeditor/tests/test_select_all_without_body.html
rename from editor/libeditor/html/tests/test_spellcheck_pref.html
rename to editor/libeditor/tests/test_spellcheck_pref.html
--- a/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/editor/libeditor/text/nsPlaintextEditor.cpp
@@ -346,17 +346,17 @@ bool nsPlaintextEditor::IsModifiable()
   return !IsReadonly();
 }
 
 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/html/tests/test_htmleditor_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
   // HandleKeyPressEvent()'s switch statement.
 
   if (IsReadonly() || IsDisabled()) {
     // When we're not editable, the events handled on nsEditor.
     return nsEditor::HandleKeyPressEvent(aKeyEvent);
   }
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -61,17 +61,16 @@ LOCAL_INCLUDES += [
     '/dom/telephony',
     '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xml',
     '/dom/xslt/xpath',
     '/dom/xslt/xslt',
     '/editor/composer',
     '/editor/libeditor',
-    '/editor/libeditor/html',
     '/editor/libeditor/text',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base/src',
     '/netwerk/cookie',
--- a/parser/htmlparser/public/nsHTMLTagList.h
+++ b/parser/htmlparser/public/nsHTMLTagList.h
@@ -25,17 +25,17 @@
   nsHTMLContentSink.cpp to create a content object for a tag of that
   type. Use NOTUSED, if the particular tag has a non-standard creator.
 
   The HTML_OTHER macro is for values in the nsHTMLTag enum that are
   not strictly tags.
 
   Entries *must* use only lowercase characters.
 
-  Don't forget to update /editor/libeditor/html/nsHTMLEditUtils.cpp as well.
+  Don't forget to update /editor/libeditor/nsHTMLEditUtils.cpp as well.
 
   ** Break these invariants and bad things will happen. **
 
  ******/
 HTML_TAG(a, Anchor)
 HTML_HTMLELEMENT_TAG(abbr)
 HTML_HTMLELEMENT_TAG(acronym)
 HTML_HTMLELEMENT_TAG(address)