☠☠ backed out by 71f6b8a9b2e8 ☠ ☠ | |
author | Birunthan Mohanathas <birunthan@mohanathas.com> |
Mon, 23 Jun 2014 16:27:43 -0700 | |
changeset 211394 | e7557f70acfebc3d0ea300ea1d78d63854d9c3cb |
parent 211393 | 5b1b527abe473a64fa9dedf7b487d453eb2e078a |
child 211395 | 62ad3254903e92e3814652dac400f00956b0a347 |
push id | 3857 |
push user | raliiev@mozilla.com |
push date | Tue, 02 Sep 2014 16:39:23 +0000 |
treeherder | mozilla-beta@5638b907b505 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ehsan |
bugs | 1028565 |
milestone | 33.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
|
rename from editor/composer/src/crashtests/351236-1.html rename to editor/composer/crashtests/351236-1.html
rename from editor/composer/src/crashtests/407062-1.html rename to editor/composer/crashtests/407062-1.html
rename from editor/composer/src/crashtests/419563-1.xhtml rename to editor/composer/crashtests/419563-1.xhtml
rename from editor/composer/src/crashtests/428844-1-inner.xhtml rename to editor/composer/crashtests/428844-1-inner.xhtml
rename from editor/composer/src/crashtests/428844-1.html rename to editor/composer/crashtests/428844-1.html
rename from editor/composer/src/crashtests/461049-1.html rename to editor/composer/crashtests/461049-1.html
rename from editor/composer/src/crashtests/crashtests.list rename to editor/composer/crashtests/crashtests.list
rename from editor/composer/src/crashtests/removing-editable-xslt-inner.xhtml rename to editor/composer/crashtests/removing-editable-xslt-inner.xhtml
rename from editor/composer/src/crashtests/removing-editable-xslt.html rename to editor/composer/crashtests/removing-editable-xslt.html
--- a/editor/composer/moz.build +++ b/editor/composer/moz.build @@ -1,8 +1,65 @@ # -*- 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/. -PARALLEL_DIRS += ['public', 'src'] TEST_DIRS += ['test'] + +XPIDL_SOURCES += [ + 'nsIEditingSession.idl', +] + +XPIDL_MODULE = 'composer' + +UNIFIED_SOURCES += [ + 'nsComposerCommands.cpp', + 'nsComposerCommandsUpdater.cpp', + 'nsComposerController.cpp', + 'nsComposerDocumentCommands.cpp', + 'nsComposerRegistration.cpp', + 'nsComposeTxtSrvFilter.cpp', + 'nsEditingSession.cpp', + 'nsEditorSpellCheck.cpp', +] + +FAIL_ON_WARNINGS = True + +FINAL_LIBRARY = 'xul' +RESOURCE_FILES += [ + 'res/EditorOverride.css', + 'res/grabber.gif', + 'res/table-add-column-after-active.gif', + 'res/table-add-column-after-hover.gif', + 'res/table-add-column-after.gif', + 'res/table-add-column-before-active.gif', + 'res/table-add-column-before-hover.gif', + 'res/table-add-column-before.gif', + 'res/table-add-row-after-active.gif', + 'res/table-add-row-after-hover.gif', + 'res/table-add-row-after.gif', + 'res/table-add-row-before-active.gif', + 'res/table-add-row-before-hover.gif', + 'res/table-add-row-before.gif', + 'res/table-remove-column-active.gif', + 'res/table-remove-column-hover.gif', + 'res/table-remove-column.gif', + 'res/table-remove-row-active.gif', + 'res/table-remove-row-hover.gif', + 'res/table-remove-row.gif', + 'res/text_caret.png', + 'res/text_caret@1.5x.png', + 'res/text_caret@2.25x.png', + 'res/text_caret@2x.png', + 'res/text_caret_tilt_left.png', + 'res/text_caret_tilt_left@1.5x.png', + 'res/text_caret_tilt_left@2.25x.png', + 'res/text_caret_tilt_left@2x.png', + 'res/text_caret_tilt_right.png', + 'res/text_caret_tilt_right@1.5x.png', + 'res/text_caret_tilt_right@2.25x.png', + 'res/text_caret_tilt_right@2x.png', + 'res/text_selection_handle.png', + 'res/text_selection_handle@1.5.png', + 'res/text_selection_handle@2.png', +]
rename from editor/composer/src/nsComposeTxtSrvFilter.cpp rename to editor/composer/nsComposeTxtSrvFilter.cpp
rename from editor/composer/src/nsComposeTxtSrvFilter.h rename to editor/composer/nsComposeTxtSrvFilter.h
rename from editor/composer/src/nsComposerCommands.cpp rename to editor/composer/nsComposerCommands.cpp
rename from editor/composer/src/nsComposerCommandsUpdater.cpp rename to editor/composer/nsComposerCommandsUpdater.cpp
rename from editor/composer/src/nsComposerCommandsUpdater.h rename to editor/composer/nsComposerCommandsUpdater.h
rename from editor/composer/src/nsComposerController.cpp rename to editor/composer/nsComposerController.cpp
rename from editor/composer/src/nsComposerController.h rename to editor/composer/nsComposerController.h
rename from editor/composer/src/nsComposerDocumentCommands.cpp rename to editor/composer/nsComposerDocumentCommands.cpp
rename from editor/composer/src/nsComposerRegistration.cpp rename to editor/composer/nsComposerRegistration.cpp
rename from editor/composer/src/nsEditorSpellCheck.cpp rename to editor/composer/nsEditorSpellCheck.cpp
rename from editor/composer/public/nsIEditingSession.idl rename to editor/composer/nsIEditingSession.idl
deleted file mode 100644 --- a/editor/composer/public/moz.build +++ /dev/null @@ -1,12 +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/. - -XPIDL_SOURCES += [ - 'nsIEditingSession.idl', -] - -XPIDL_MODULE = 'composer' -
rename from editor/composer/src/res/EditorOverride.css rename to editor/composer/res/EditorOverride.css
rename from editor/composer/src/res/table-add-column-after-active.gif rename to editor/composer/res/table-add-column-after-active.gif
rename from editor/composer/src/res/table-add-column-after-hover.gif rename to editor/composer/res/table-add-column-after-hover.gif
rename from editor/composer/src/res/table-add-column-after.gif rename to editor/composer/res/table-add-column-after.gif
rename from editor/composer/src/res/table-add-column-before-active.gif rename to editor/composer/res/table-add-column-before-active.gif
rename from editor/composer/src/res/table-add-column-before-hover.gif rename to editor/composer/res/table-add-column-before-hover.gif
rename from editor/composer/src/res/table-add-column-before.gif rename to editor/composer/res/table-add-column-before.gif
rename from editor/composer/src/res/table-add-row-after-active.gif rename to editor/composer/res/table-add-row-after-active.gif
rename from editor/composer/src/res/table-add-row-after-hover.gif rename to editor/composer/res/table-add-row-after-hover.gif
rename from editor/composer/src/res/table-add-row-after.gif rename to editor/composer/res/table-add-row-after.gif
rename from editor/composer/src/res/table-add-row-before-active.gif rename to editor/composer/res/table-add-row-before-active.gif
rename from editor/composer/src/res/table-add-row-before-hover.gif rename to editor/composer/res/table-add-row-before-hover.gif
rename from editor/composer/src/res/table-add-row-before.gif rename to editor/composer/res/table-add-row-before.gif
rename from editor/composer/src/res/table-remove-column-active.gif rename to editor/composer/res/table-remove-column-active.gif
rename from editor/composer/src/res/table-remove-column-hover.gif rename to editor/composer/res/table-remove-column-hover.gif
rename from editor/composer/src/res/table-remove-column.gif rename to editor/composer/res/table-remove-column.gif
rename from editor/composer/src/res/table-remove-row-active.gif rename to editor/composer/res/table-remove-row-active.gif
rename from editor/composer/src/res/table-remove-row-hover.gif rename to editor/composer/res/table-remove-row-hover.gif
rename from editor/composer/src/res/table-remove-row.gif rename to editor/composer/res/table-remove-row.gif
rename from editor/composer/src/res/text_caret@1.5x.png rename to editor/composer/res/text_caret@1.5x.png
rename from editor/composer/src/res/text_caret@2.25x.png rename to editor/composer/res/text_caret@2.25x.png
rename from editor/composer/src/res/text_caret@2x.png rename to editor/composer/res/text_caret@2x.png
rename from editor/composer/src/res/text_caret_tilt_left.png rename to editor/composer/res/text_caret_tilt_left.png
rename from editor/composer/src/res/text_caret_tilt_left@1.5x.png rename to editor/composer/res/text_caret_tilt_left@1.5x.png
rename from editor/composer/src/res/text_caret_tilt_left@2.25x.png rename to editor/composer/res/text_caret_tilt_left@2.25x.png
rename from editor/composer/src/res/text_caret_tilt_left@2x.png rename to editor/composer/res/text_caret_tilt_left@2x.png
rename from editor/composer/src/res/text_caret_tilt_right.png rename to editor/composer/res/text_caret_tilt_right.png
rename from editor/composer/src/res/text_caret_tilt_right@1.5x.png rename to editor/composer/res/text_caret_tilt_right@1.5x.png
rename from editor/composer/src/res/text_caret_tilt_right@2.25x.png rename to editor/composer/res/text_caret_tilt_right@2.25x.png
rename from editor/composer/src/res/text_caret_tilt_right@2x.png rename to editor/composer/res/text_caret_tilt_right@2x.png
rename from editor/composer/src/res/text_selection_handle.png rename to editor/composer/res/text_selection_handle.png
rename from editor/composer/src/res/text_selection_handle@1.5.png rename to editor/composer/res/text_selection_handle@1.5.png
rename from editor/composer/src/res/text_selection_handle@2.png rename to editor/composer/res/text_selection_handle@2.png
deleted file mode 100644 --- a/editor/composer/src/moz.build +++ /dev/null @@ -1,57 +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 += [ - 'nsComposerCommands.cpp', - 'nsComposerCommandsUpdater.cpp', - 'nsComposerController.cpp', - 'nsComposerDocumentCommands.cpp', - 'nsComposerRegistration.cpp', - 'nsComposeTxtSrvFilter.cpp', - 'nsEditingSession.cpp', - 'nsEditorSpellCheck.cpp', -] - -FAIL_ON_WARNINGS = True - -FINAL_LIBRARY = 'xul' -RESOURCE_FILES += [ - 'res/EditorOverride.css', - 'res/grabber.gif', - 'res/table-add-column-after-active.gif', - 'res/table-add-column-after-hover.gif', - 'res/table-add-column-after.gif', - 'res/table-add-column-before-active.gif', - 'res/table-add-column-before-hover.gif', - 'res/table-add-column-before.gif', - 'res/table-add-row-after-active.gif', - 'res/table-add-row-after-hover.gif', - 'res/table-add-row-after.gif', - 'res/table-add-row-before-active.gif', - 'res/table-add-row-before-hover.gif', - 'res/table-add-row-before.gif', - 'res/table-remove-column-active.gif', - 'res/table-remove-column-hover.gif', - 'res/table-remove-column.gif', - 'res/table-remove-row-active.gif', - 'res/table-remove-row-hover.gif', - 'res/table-remove-row.gif', - 'res/text_caret.png', - 'res/text_caret@1.5x.png', - 'res/text_caret@2.25x.png', - 'res/text_caret@2x.png', - 'res/text_caret_tilt_left.png', - 'res/text_caret_tilt_left@1.5x.png', - 'res/text_caret_tilt_left@2.25x.png', - 'res/text_caret_tilt_left@2x.png', - 'res/text_caret_tilt_right.png', - 'res/text_caret_tilt_right@1.5x.png', - 'res/text_caret_tilt_right@2.25x.png', - 'res/text_caret_tilt_right@2x.png', - 'res/text_selection_handle.png', - 'res/text_selection_handle@1.5.png', - 'res/text_selection_handle@2.png', -]
--- a/editor/crashtests.list +++ b/editor/crashtests.list @@ -1,9 +1,9 @@ # 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/base/crashtests/crashtests.list include libeditor/text/crashtests/crashtests.list -include composer/src/crashtests/crashtests.list +include composer/crashtests/crashtests.list include txmgr/tests/crashtests/crashtests.list
--- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -61,17 +61,17 @@ LOCAL_INCLUDES += [ '/dom/src/offline', '/dom/src/storage', '/dom/telephony', '/dom/xbl', '/dom/xslt/base', '/dom/xslt/xml', '/dom/xslt/xpath', '/dom/xslt/xslt', - '/editor/composer/src', + '/editor/composer', '/editor/libeditor/base', '/editor/libeditor/html', '/editor/libeditor/text', '/editor/txmgr/src', '/editor/txtsvc/src', '/extensions/cookie', '/js/xpconnect/loader', '/js/xpconnect/src',