author | Ehsan Akhgari <ehsan@mozilla.com> |
Mon, 18 Aug 2014 20:59:37 -0400 | |
changeset 200232 | 8f48ab6499cfa2f071d8bb3c550884e94dbc7803 |
parent 200231 | 43cff6db8708ca58fcb0c8e5c5c3e89cef5a00c5 |
child 200233 | 33fcf51e6d13321ea7667fe2bbac4cf564acf3fb |
push id | 47843 |
push user | eakhgari@mozilla.com |
push date | Tue, 19 Aug 2014 00:59:48 +0000 |
treeherder | mozilla-inbound@8f48ab6499cf [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | poiru |
bugs | 1055286 |
milestone | 34.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
|
--- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -174,17 +174,16 @@ LOCAL_INCLUDES += [ '/content/base/src', '/content/html/document/src', '/content/media/', '/content/xul/content/src', '/dom/base', '/dom/canvas', '/dom/xbl', '/editor/libeditor', - '/editor/libeditor/text', '/editor/txmgr', '/layout/forms', '/layout/generic', '/layout/style', '/layout/tables', '/layout/xul', '/netwerk/base/src', ]
--- a/editor/crashtests.list +++ b/editor/crashtests.list @@ -1,8 +1,7 @@ # 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/crashtests/crashtests.list -include libeditor/text/crashtests/crashtests.list include composer/crashtests/crashtests.list include txmgr/tests/crashtests/crashtests.list
rename from editor/libeditor/text/crashtests/403965-1.xhtml rename to editor/libeditor/crashtests/403965-1.xhtml
rename from editor/libeditor/text/crashtests/580151-1.xhtml rename to editor/libeditor/crashtests/580151-1.xhtml
--- a/editor/libeditor/crashtests/crashtests.list +++ b/editor/libeditor/crashtests/crashtests.list @@ -1,13 +1,14 @@ load 336081-1.xhtml 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 load 407277-1.html load 414178-1.html load 418923-1.html asserts(0-16) load 420439.html # Bug 439258 load 428489-1.html @@ -21,16 +22,17 @@ 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 580151-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
--- a/editor/libeditor/moz.build +++ b/editor/libeditor/moz.build @@ -1,16 +1,14 @@ # -*- 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'] - TEST_DIRS += ['tests'] UNIFIED_SOURCES += [ 'ChangeAttributeTxn.cpp', 'ChangeCSSInlineStyleTxn.cpp', 'CreateElementTxn.cpp', 'DeleteNodeTxn.cpp', 'DeleteRangeTxn.cpp', @@ -34,19 +32,25 @@ UNIFIED_SOURCES += [ 'nsHTMLEditor.cpp', 'nsHTMLEditorEventListener.cpp', 'nsHTMLEditorStyle.cpp', 'nsHTMLEditRules.cpp', 'nsHTMLEditUtils.cpp', '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', 'SplitElementTxn.cpp', 'TextEditorTest.cpp', 'TypeInState.cpp', ] @@ -55,12 +59,11 @@ 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'
--- a/editor/libeditor/nsEditor.cpp +++ b/editor/libeditor/nsEditor.cpp @@ -4750,17 +4750,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/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 // HandleKeyPressEvent()'s switch statement. WidgetKeyboardEvent* nativeKeyEvent = aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent(); NS_ENSURE_TRUE(nativeKeyEvent, NS_ERROR_UNEXPECTED);
rename from editor/libeditor/text/nsInternetCiter.cpp rename to editor/libeditor/nsInternetCiter.cpp --- a/editor/libeditor/text/nsInternetCiter.cpp +++ b/editor/libeditor/nsInternetCiter.cpp @@ -14,17 +14,16 @@ #include "nsInternetCiter.h" #include "nsLWBrkCIID.h" #include "nsServiceManagerUtils.h" #include "nsString.h" #include "nsStringIterator.h" const char16_t gt ('>'); const char16_t space (' '); -const char16_t nbsp (0xa0); const char16_t nl ('\n'); const char16_t cr('\r'); /** Mail citations using the Internet style: > This is a citation */ nsresult nsInternetCiter::GetCiteString(const nsAString& aInString, nsAString& aOutString) @@ -137,16 +136,17 @@ BreakLine(nsAString& aOutString, uint32_ outStringCol = citeLevel + 1; } else outStringCol = 0; } static inline bool IsSpace(char16_t c) { + const char16_t nbsp (0xa0); return (nsCRT::IsAsciiSpace(c) || (c == nl) || (c == cr) || (c == nbsp)); } nsresult nsInternetCiter::Rewrap(const nsAString& aInString, uint32_t aWrapCol, uint32_t aFirstLineOffset, bool aRespectNewlines, nsAString& aOutString)
rename from editor/libeditor/text/nsPlaintextDataTransfer.cpp rename to editor/libeditor/nsPlaintextDataTransfer.cpp
rename from editor/libeditor/text/nsPlaintextEditor.cpp rename to editor/libeditor/nsPlaintextEditor.cpp --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/nsPlaintextEditor.cpp @@ -345,17 +345,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/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 // HandleKeyPressEvent()'s switch statement. if (IsReadonly() || IsDisabled()) { // When we're not editable, the events handled on nsEditor. return nsEditor::HandleKeyPressEvent(aKeyEvent);
rename from editor/libeditor/text/nsPlaintextEditor.h rename to editor/libeditor/nsPlaintextEditor.h
rename from editor/libeditor/text/nsTextEditRules.cpp rename to editor/libeditor/nsTextEditRules.cpp
rename from editor/libeditor/text/nsTextEditRulesBidi.cpp rename to editor/libeditor/nsTextEditRulesBidi.cpp
rename from editor/libeditor/text/nsTextEditUtils.cpp rename to editor/libeditor/nsTextEditUtils.cpp
--- a/editor/libeditor/tests/chrome.ini +++ b/editor/libeditor/tests/chrome.ini @@ -1,20 +1,30 @@ [DEFAULT] 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"
--- a/editor/libeditor/tests/mochitest.ini +++ b/editor/libeditor/tests/mochitest.ini @@ -13,16 +13,17 @@ support-files = green.png [test_bug200416.html] [test_bug289384.html] 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] skip-if = toolkit == 'android' [test_bug404320.html] [test_bug408231.html] skip-if = toolkit == 'android' [test_bug410986.html] @@ -33,90 +34,119 @@ skip-if = toolkit == 'android' || e10s 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_bug471722.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_bug527935.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_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' [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_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 [test_bug674770-2.html] 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] [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_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] skip-if = e10s [test_spellcheck_pref.html] skip-if = toolkit == 'android'
rename from editor/libeditor/text/tests/test_bug1026397.html rename to editor/libeditor/tests/test_bug1026397.html
rename from editor/libeditor/text/tests/test_bug318065.html rename to editor/libeditor/tests/test_bug318065.html
rename from editor/libeditor/text/tests/test_bug471319.html rename to editor/libeditor/tests/test_bug471319.html
rename from editor/libeditor/text/tests/test_bug471722.html rename to editor/libeditor/tests/test_bug471722.html
rename from editor/libeditor/text/tests/test_bug483651.html rename to editor/libeditor/tests/test_bug483651.html
rename from editor/libeditor/text/tests/test_bug527935.html rename to editor/libeditor/tests/test_bug527935.html
rename from editor/libeditor/text/tests/test_bug569988.html rename to editor/libeditor/tests/test_bug569988.html
rename from editor/libeditor/text/tests/test_bug590554.html rename to editor/libeditor/tests/test_bug590554.html
rename from editor/libeditor/text/tests/test_bug596001.html rename to editor/libeditor/tests/test_bug596001.html
rename from editor/libeditor/text/tests/test_bug596333.html rename to editor/libeditor/tests/test_bug596333.html
rename from editor/libeditor/text/tests/test_bug596506.html rename to editor/libeditor/tests/test_bug596506.html
rename from editor/libeditor/text/tests/test_bug597331.html rename to editor/libeditor/tests/test_bug597331.html
rename from editor/libeditor/text/tests/test_bug600570.html rename to editor/libeditor/tests/test_bug600570.html
rename from editor/libeditor/text/tests/test_bug602130.html rename to editor/libeditor/tests/test_bug602130.html
rename from editor/libeditor/text/tests/test_bug603556.html rename to editor/libeditor/tests/test_bug603556.html
rename from editor/libeditor/text/tests/test_bug604532.html rename to editor/libeditor/tests/test_bug604532.html
rename from editor/libeditor/text/tests/test_bug625452.html rename to editor/libeditor/tests/test_bug625452.html
rename from editor/libeditor/text/tests/test_bug629172.html rename to editor/libeditor/tests/test_bug629172.html
rename from editor/libeditor/text/tests/test_bug636465.xul rename to editor/libeditor/tests/test_bug636465.xul
rename from editor/libeditor/text/tests/test_bug638596.html rename to editor/libeditor/tests/test_bug638596.html
rename from editor/libeditor/text/tests/test_bug641466.html rename to editor/libeditor/tests/test_bug641466.html
rename from editor/libeditor/text/tests/test_bug645914.html rename to editor/libeditor/tests/test_bug645914.html
rename from editor/libeditor/text/tests/test_bug681229.html rename to editor/libeditor/tests/test_bug681229.html
rename from editor/libeditor/text/tests/test_bug692520.html rename to editor/libeditor/tests/test_bug692520.html
rename from editor/libeditor/text/tests/test_bug740784.html rename to editor/libeditor/tests/test_bug740784.html
rename from editor/libeditor/text/tests/test_bug757771.html rename to editor/libeditor/tests/test_bug757771.html
rename from editor/libeditor/text/tests/test_bug830600.html rename to editor/libeditor/tests/test_bug830600.html
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
rename from editor/libeditor/text/tests/test_texteditor_keyevent_handling.html rename to editor/libeditor/tests/test_texteditor_keyevent_handling.html
deleted file mode 100644 --- a/editor/libeditor/text/crashtests/crashtests.list +++ /dev/null @@ -1,2 +0,0 @@ -load 403965-1.xhtml -load 580151-1.xhtml
deleted file mode 100644 --- 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']
deleted file mode 100644 --- 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"
deleted file mode 100644 --- 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]
--- 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/text', '/editor/txmgr', '/editor/txtsvc', '/extensions/cookie', '/js/xpconnect/loader', '/js/xpconnect/src', '/netwerk/base/src', '/netwerk/cookie', '/view',
--- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -41,17 +41,16 @@ FAIL_ON_WARNINGS = True MSVC_ENABLE_PGO = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../content/base/src', '../../content/html/content/src', '../../editor/libeditor', - '../../editor/libeditor/text', '../../editor/txmgr', '../base', '../generic', '../xul', ] if CONFIG['ENABLE_INTL_API']: # nsNumberControlFrame.cpp requires ICUUtils.h which in turn requires
--- a/testing/mochitest/androidx86.json +++ b/testing/mochitest/androidx86.json @@ -86,18 +86,18 @@ "dom/datastore/tests/test_readonly.html": "x86 only bug 936226", "dom/devicestorage": "bug 781789 & bug 782275", "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227", "dom/imptests/editing/conformancetest/test_runtest.html": "", "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227", "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", "image/test/mochitest/test_bug490949.html": "x86 only", "image/test/mochitest/test_bug497665.html": "x86 only", "image/test/mochitest/test_bug601470.html": "x86 only", "image/test/mochitest/test_bug89419-1.html": "x86 only", "layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",