author | Birunthan Mohanathas <birunthan@mohanathas.com> |
Sun, 22 Jun 2014 10:15:19 -0700 | |
changeset 190354 | 85b4fe3a7fa90caa702aa36f6985c667d9e01b02 |
parent 190353 | 43a7ce129020b6c34182b6750f521fe5b7f43077 |
child 190355 | e3858c50afba19807775b48e883b896352f266cf |
push id | 27004 |
push user | emorley@mozilla.com |
push date | Tue, 24 Jun 2014 15:52:34 +0000 |
treeherder | mozilla-central@7b174d47f3cc [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | surkov |
bugs | 1028563 |
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 accessible/src/atk/ARIAGridAccessibleWrap.h rename to accessible/atk/ARIAGridAccessibleWrap.h
rename from accessible/src/atk/ApplicationAccessibleWrap.cpp rename to accessible/atk/ApplicationAccessibleWrap.cpp
rename from accessible/src/atk/ApplicationAccessibleWrap.h rename to accessible/atk/ApplicationAccessibleWrap.h
rename from accessible/src/atk/AtkSocketAccessible.cpp rename to accessible/atk/AtkSocketAccessible.cpp
rename from accessible/src/atk/HTMLTableAccessibleWrap.h rename to accessible/atk/HTMLTableAccessibleWrap.h
rename from accessible/src/atk/HyperTextAccessibleWrap.h rename to accessible/atk/HyperTextAccessibleWrap.h
rename from accessible/src/atk/RootAccessibleWrap.cpp rename to accessible/atk/RootAccessibleWrap.cpp
rename from accessible/src/atk/TextLeafAccessibleWrap.h rename to accessible/atk/TextLeafAccessibleWrap.h
rename from accessible/src/atk/XULListboxAccessibleWrap.h rename to accessible/atk/XULListboxAccessibleWrap.h
rename from accessible/src/atk/XULMenuAccessibleWrap.h rename to accessible/atk/XULMenuAccessibleWrap.h
rename from accessible/src/atk/XULTreeGridAccessibleWrap.h rename to accessible/atk/XULTreeGridAccessibleWrap.h
rename from accessible/src/atk/moz.build rename to accessible/atk/moz.build --- a/accessible/src/atk/moz.build +++ b/accessible/atk/moz.build @@ -27,17 +27,17 @@ SOURCES += [ 'nsMaiInterfaceText.cpp', 'nsMaiInterfaceValue.cpp', 'Platform.cpp', 'RootAccessibleWrap.cpp', 'UtilInterface.cpp', ] LOCAL_INCLUDES += [ - '../base', - '../generic', - '../html', - '../xpcom', - '../xul', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/xpcom', + '/accessible/xul', '/other-licenses/atk-1.0', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/atk/nsMaiInterfaceAction.cpp rename to accessible/atk/nsMaiInterfaceAction.cpp
rename from accessible/src/atk/nsMaiInterfaceComponent.cpp rename to accessible/atk/nsMaiInterfaceComponent.cpp
rename from accessible/src/atk/nsMaiInterfaceDocument.cpp rename to accessible/atk/nsMaiInterfaceDocument.cpp
rename from accessible/src/atk/nsMaiInterfaceEditableText.cpp rename to accessible/atk/nsMaiInterfaceEditableText.cpp
rename from accessible/src/atk/nsMaiInterfaceHyperlinkImpl.cpp rename to accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp
rename from accessible/src/atk/nsMaiInterfaceHypertext.cpp rename to accessible/atk/nsMaiInterfaceHypertext.cpp
rename from accessible/src/atk/nsMaiInterfaceImage.cpp rename to accessible/atk/nsMaiInterfaceImage.cpp
rename from accessible/src/atk/nsMaiInterfaceSelection.cpp rename to accessible/atk/nsMaiInterfaceSelection.cpp
rename from accessible/src/atk/nsMaiInterfaceTable.cpp rename to accessible/atk/nsMaiInterfaceTable.cpp
rename from accessible/src/atk/nsMaiInterfaceText.cpp rename to accessible/atk/nsMaiInterfaceText.cpp
rename from accessible/src/atk/nsMaiInterfaceValue.cpp rename to accessible/atk/nsMaiInterfaceValue.cpp
rename from accessible/src/base/NotificationController.cpp rename to accessible/base/NotificationController.cpp
rename from accessible/src/base/NotificationController.h rename to accessible/base/NotificationController.h
rename from accessible/src/base/moz.build rename to accessible/base/moz.build --- a/accessible/src/base/moz.build +++ b/accessible/base/moz.build @@ -53,40 +53,40 @@ UNIFIED_SOURCES += [ ] if CONFIG['A11Y_LOG']: UNIFIED_SOURCES += [ 'Logging.cpp', ] LOCAL_INCLUDES += [ - '../generic', - '../html', - '../xpcom', - '../xul', + '/accessible/generic', + '/accessible/html', + '/accessible/xpcom', + '/accessible/xul', '/dom/xbl', '/ipc/chromium/src', '/layout/generic', '/layout/style', '/layout/svg', '/layout/xul', '/layout/xul/tree/', ] if CONFIG['MOZ_ENABLE_GTK']: LOCAL_INCLUDES += [ - '../atk', + '/accessible/atk', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += [ - '../windows/ia2', - '../windows/msaa', + '/accessible/windows/ia2', + '/accessible/windows/msaa', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ - '../mac', + '/accessible/mac', ] else: LOCAL_INCLUDES += [ - '../other', + '/accessible/other', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/base/nsAccessibilityService.cpp rename to accessible/base/nsAccessibilityService.cpp
rename from accessible/src/base/nsAccessibilityService.h rename to accessible/base/nsAccessibilityService.h
rename from accessible/src/base/nsAccessiblePivot.cpp rename to accessible/base/nsAccessiblePivot.cpp
rename from accessible/src/generic/ARIAGridAccessible-inl.h rename to accessible/generic/ARIAGridAccessible-inl.h
rename from accessible/src/generic/ARIAGridAccessible.cpp rename to accessible/generic/ARIAGridAccessible.cpp
rename from accessible/src/generic/ARIAGridAccessible.h rename to accessible/generic/ARIAGridAccessible.h
rename from accessible/src/generic/ApplicationAccessible.cpp rename to accessible/generic/ApplicationAccessible.cpp
rename from accessible/src/generic/ApplicationAccessible.h rename to accessible/generic/ApplicationAccessible.h
rename from accessible/src/generic/BaseAccessibles.cpp rename to accessible/generic/BaseAccessibles.cpp
rename from accessible/src/generic/DocAccessible-inl.h rename to accessible/generic/DocAccessible-inl.h
rename from accessible/src/generic/FormControlAccessible.cpp rename to accessible/generic/FormControlAccessible.cpp
rename from accessible/src/generic/FormControlAccessible.h rename to accessible/generic/FormControlAccessible.h
rename from accessible/src/generic/HyperTextAccessible-inl.h rename to accessible/generic/HyperTextAccessible-inl.h
rename from accessible/src/generic/HyperTextAccessible.cpp rename to accessible/generic/HyperTextAccessible.cpp
rename from accessible/src/generic/HyperTextAccessible.h rename to accessible/generic/HyperTextAccessible.h
rename from accessible/src/generic/ImageAccessible.cpp rename to accessible/generic/ImageAccessible.cpp
rename from accessible/src/generic/OuterDocAccessible.cpp rename to accessible/generic/OuterDocAccessible.cpp
rename from accessible/src/generic/OuterDocAccessible.h rename to accessible/generic/OuterDocAccessible.h
rename from accessible/src/generic/RootAccessible.cpp rename to accessible/generic/RootAccessible.cpp
rename from accessible/src/generic/TableCellAccessible.cpp rename to accessible/generic/TableCellAccessible.cpp
rename from accessible/src/generic/TableCellAccessible.h rename to accessible/generic/TableCellAccessible.h
rename from accessible/src/generic/TextLeafAccessible.cpp rename to accessible/generic/TextLeafAccessible.cpp
rename from accessible/src/generic/TextLeafAccessible.h rename to accessible/generic/TextLeafAccessible.h
rename from accessible/src/generic/moz.build rename to accessible/generic/moz.build --- a/accessible/src/generic/moz.build +++ b/accessible/generic/moz.build @@ -21,35 +21,35 @@ UNIFIED_SOURCES += [ 'ImageAccessible.cpp', 'OuterDocAccessible.cpp', 'RootAccessible.cpp', 'TableCellAccessible.cpp', 'TextLeafAccessible.cpp', ] LOCAL_INCLUDES += [ - '../../../layout/generic', - '../../../layout/xul', - '../base', - '../html', - '../xpcom', - '../xul', + '/accessible/base', + '/accessible/html', + '/accessible/xpcom', + '/accessible/xul', + '/layout/generic', + '/layout/xul', ] if CONFIG['MOZ_ENABLE_GTK']: LOCAL_INCLUDES += [ - '../atk', + '/accessible/atk', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += [ - '../windows/ia2', - '../windows/msaa', + '/accessible/windows/ia2', + '/accessible/windows/msaa', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ - '../mac', + '/accessible/mac', ] else: LOCAL_INCLUDES += [ - '../other', + '/accessible/other', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/html/HTMLCanvasAccessible.cpp rename to accessible/html/HTMLCanvasAccessible.cpp
rename from accessible/src/html/HTMLCanvasAccessible.h rename to accessible/html/HTMLCanvasAccessible.h
rename from accessible/src/html/HTMLElementAccessibles.cpp rename to accessible/html/HTMLElementAccessibles.cpp
rename from accessible/src/html/HTMLElementAccessibles.h rename to accessible/html/HTMLElementAccessibles.h
rename from accessible/src/html/HTMLFormControlAccessible.cpp rename to accessible/html/HTMLFormControlAccessible.cpp
rename from accessible/src/html/HTMLFormControlAccessible.h rename to accessible/html/HTMLFormControlAccessible.h
rename from accessible/src/html/HTMLImageMapAccessible.cpp rename to accessible/html/HTMLImageMapAccessible.cpp
rename from accessible/src/html/HTMLImageMapAccessible.h rename to accessible/html/HTMLImageMapAccessible.h
rename from accessible/src/html/HTMLLinkAccessible.cpp rename to accessible/html/HTMLLinkAccessible.cpp
rename from accessible/src/html/HTMLListAccessible.cpp rename to accessible/html/HTMLListAccessible.cpp
rename from accessible/src/html/HTMLSelectAccessible.cpp rename to accessible/html/HTMLSelectAccessible.cpp
rename from accessible/src/html/HTMLSelectAccessible.h rename to accessible/html/HTMLSelectAccessible.h
rename from accessible/src/html/HTMLTableAccessible.cpp rename to accessible/html/HTMLTableAccessible.cpp
rename from accessible/src/html/HTMLTableAccessible.h rename to accessible/html/HTMLTableAccessible.h
rename from accessible/src/html/moz.build rename to accessible/html/moz.build --- a/accessible/src/html/moz.build +++ b/accessible/html/moz.build @@ -11,35 +11,35 @@ UNIFIED_SOURCES += [ 'HTMLImageMapAccessible.cpp', 'HTMLLinkAccessible.cpp', 'HTMLListAccessible.cpp', 'HTMLSelectAccessible.cpp', 'HTMLTableAccessible.cpp', ] LOCAL_INCLUDES += [ - '../../../layout/generic', - '../../../layout/tables', - '../../../layout/xul', - '../base', - '../generic', - '../xpcom', + '/accessible/base', + '/accessible/generic', + '/accessible/xpcom', + '/layout/generic', + '/layout/tables', + '/layout/xul', ] if CONFIG['MOZ_ENABLE_GTK']: LOCAL_INCLUDES += [ - '../atk', + '/accessible/atk', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += [ - '../windows/ia2', - '../windows/msaa', + '/accessible/windows/ia2', + '/accessible/windows/msaa', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ - '../mac', + '/accessible/mac', ] else: LOCAL_INCLUDES += [ - '../other', + '/accessible/other', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/jsat/sounds/virtual_cursor_key.ogg rename to accessible/jsat/sounds/virtual_cursor_key.ogg
rename from accessible/src/jsat/sounds/virtual_cursor_move.ogg rename to accessible/jsat/sounds/virtual_cursor_move.ogg
rename from accessible/src/mac/ARIAGridAccessibleWrap.h rename to accessible/mac/ARIAGridAccessibleWrap.h
rename from accessible/src/mac/ApplicationAccessibleWrap.h rename to accessible/mac/ApplicationAccessibleWrap.h
rename from accessible/src/mac/HTMLTableAccessibleWrap.h rename to accessible/mac/HTMLTableAccessibleWrap.h
rename from accessible/src/mac/HyperTextAccessibleWrap.h rename to accessible/mac/HyperTextAccessibleWrap.h
rename from accessible/src/mac/TextLeafAccessibleWrap.h rename to accessible/mac/TextLeafAccessibleWrap.h
rename from accessible/src/mac/XULListboxAccessibleWrap.h rename to accessible/mac/XULListboxAccessibleWrap.h
rename from accessible/src/mac/XULMenuAccessibleWrap.h rename to accessible/mac/XULMenuAccessibleWrap.h
rename from accessible/src/mac/XULTreeGridAccessibleWrap.h rename to accessible/mac/XULTreeGridAccessibleWrap.h
rename from accessible/src/mac/moz.build rename to accessible/mac/moz.build --- a/accessible/src/mac/moz.build +++ b/accessible/mac/moz.build @@ -22,19 +22,19 @@ UNIFIED_SOURCES += [ 'mozDocAccessible.mm', 'mozHTMLAccessible.mm', 'mozTextAccessible.mm', 'Platform.mm', 'RootAccessibleWrap.mm', ] LOCAL_INCLUDES += [ - '../base', - '../generic', - '../html', - '../xul', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/xul', '/layout/generic', '/layout/xul', '/widget/cocoa', '/widget/xpwidgets', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/mac/mozAccessibleProtocol.h rename to accessible/mac/mozAccessibleProtocol.h
--- a/accessible/moz.build +++ b/accessible/moz.build @@ -1,9 +1,23 @@ # -*- 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 += ['public', 'src'] +toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] + +if CONFIG['MOZ_ENABLE_GTK']: + DIRS += ['atk'] +elif toolkit == 'windows': + DIRS += ['windows'] +elif toolkit == 'cocoa': + DIRS += ['mac'] +else: + DIRS += ['other'] + +DIRS += ['base', 'generic', 'html', 'jsat', 'public', 'xpcom'] + +if CONFIG['MOZ_XUL']: + DIRS += ['xul'] + TEST_DIRS += ['tests'] -
rename from accessible/src/other/ARIAGridAccessibleWrap.h rename to accessible/other/ARIAGridAccessibleWrap.h
rename from accessible/src/other/ApplicationAccessibleWrap.h rename to accessible/other/ApplicationAccessibleWrap.h
rename from accessible/src/other/HTMLTableAccessibleWrap.h rename to accessible/other/HTMLTableAccessibleWrap.h
rename from accessible/src/other/HyperTextAccessibleWrap.h rename to accessible/other/HyperTextAccessibleWrap.h
rename from accessible/src/other/ImageAccessibleWrap.h rename to accessible/other/ImageAccessibleWrap.h
rename from accessible/src/other/RootAccessibleWrap.h rename to accessible/other/RootAccessibleWrap.h
rename from accessible/src/other/TextLeafAccessibleWrap.h rename to accessible/other/TextLeafAccessibleWrap.h
rename from accessible/src/other/XULListboxAccessibleWrap.h rename to accessible/other/XULListboxAccessibleWrap.h
rename from accessible/src/other/XULMenuAccessibleWrap.h rename to accessible/other/XULMenuAccessibleWrap.h
rename from accessible/src/other/XULTreeGridAccessibleWrap.h rename to accessible/other/XULTreeGridAccessibleWrap.h
rename from accessible/src/other/moz.build rename to accessible/other/moz.build --- a/accessible/src/other/moz.build +++ b/accessible/other/moz.build @@ -10,15 +10,15 @@ EXPORTS.mozilla.a11y += [ ] SOURCES += [ 'AccessibleWrap.cpp', 'Platform.cpp', ] LOCAL_INCLUDES += [ - '../base', - '../generic', - '../html', - '../xul', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/xul', ] FINAL_LIBRARY = 'xul'
deleted file mode 100644 --- a/accessible/src/moz.build +++ /dev/null @@ -1,22 +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/. - -toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] - -if CONFIG['MOZ_ENABLE_GTK']: - DIRS += ['atk'] -elif toolkit == 'windows': - DIRS += ['windows'] -elif toolkit == 'cocoa': - DIRS += ['mac'] -else: - DIRS += ['other'] - - -DIRS += ['base', 'generic', 'html', 'jsat', 'xpcom'] - -if CONFIG['MOZ_XUL']: - DIRS += ['xul']
rename from accessible/src/windows/ia2/ia2Accessible.cpp rename to accessible/windows/ia2/ia2Accessible.cpp
rename from accessible/src/windows/ia2/ia2Accessible.h rename to accessible/windows/ia2/ia2Accessible.h
rename from accessible/src/windows/ia2/ia2AccessibleAction.cpp rename to accessible/windows/ia2/ia2AccessibleAction.cpp
rename from accessible/src/windows/ia2/ia2AccessibleAction.h rename to accessible/windows/ia2/ia2AccessibleAction.h
rename from accessible/src/windows/ia2/ia2AccessibleComponent.cpp rename to accessible/windows/ia2/ia2AccessibleComponent.cpp
rename from accessible/src/windows/ia2/ia2AccessibleComponent.h rename to accessible/windows/ia2/ia2AccessibleComponent.h
rename from accessible/src/windows/ia2/ia2AccessibleEditableText.cpp rename to accessible/windows/ia2/ia2AccessibleEditableText.cpp
rename from accessible/src/windows/ia2/ia2AccessibleEditableText.h rename to accessible/windows/ia2/ia2AccessibleEditableText.h
rename from accessible/src/windows/ia2/ia2AccessibleHyperlink.cpp rename to accessible/windows/ia2/ia2AccessibleHyperlink.cpp
rename from accessible/src/windows/ia2/ia2AccessibleHyperlink.h rename to accessible/windows/ia2/ia2AccessibleHyperlink.h
rename from accessible/src/windows/ia2/ia2AccessibleHypertext.cpp rename to accessible/windows/ia2/ia2AccessibleHypertext.cpp
rename from accessible/src/windows/ia2/ia2AccessibleHypertext.h rename to accessible/windows/ia2/ia2AccessibleHypertext.h
rename from accessible/src/windows/ia2/ia2AccessibleImage.cpp rename to accessible/windows/ia2/ia2AccessibleImage.cpp
rename from accessible/src/windows/ia2/ia2AccessibleImage.h rename to accessible/windows/ia2/ia2AccessibleImage.h
rename from accessible/src/windows/ia2/ia2AccessibleRelation.cpp rename to accessible/windows/ia2/ia2AccessibleRelation.cpp
rename from accessible/src/windows/ia2/ia2AccessibleRelation.h rename to accessible/windows/ia2/ia2AccessibleRelation.h
rename from accessible/src/windows/ia2/ia2AccessibleTable.cpp rename to accessible/windows/ia2/ia2AccessibleTable.cpp
rename from accessible/src/windows/ia2/ia2AccessibleTable.h rename to accessible/windows/ia2/ia2AccessibleTable.h
rename from accessible/src/windows/ia2/ia2AccessibleTableCell.cpp rename to accessible/windows/ia2/ia2AccessibleTableCell.cpp
rename from accessible/src/windows/ia2/ia2AccessibleTableCell.h rename to accessible/windows/ia2/ia2AccessibleTableCell.h
rename from accessible/src/windows/ia2/ia2AccessibleText.cpp rename to accessible/windows/ia2/ia2AccessibleText.cpp
rename from accessible/src/windows/ia2/ia2AccessibleText.h rename to accessible/windows/ia2/ia2AccessibleText.h
rename from accessible/src/windows/ia2/ia2AccessibleValue.cpp rename to accessible/windows/ia2/ia2AccessibleValue.cpp
rename from accessible/src/windows/ia2/ia2AccessibleValue.h rename to accessible/windows/ia2/ia2AccessibleValue.h
rename from accessible/src/windows/ia2/moz.build rename to accessible/windows/ia2/moz.build --- a/accessible/src/windows/ia2/moz.build +++ b/accessible/windows/ia2/moz.build @@ -31,17 +31,17 @@ UNIFIED_SOURCES += [ # These files cannot be built in unified mode because they both include # AccessibleTable2_i.c. SOURCES += [ 'ia2AccessibleTable.cpp', 'ia2AccessibleTableCell.cpp', ] LOCAL_INCLUDES += [ - '../../base', - '../../generic', - '../../html', - '../../xpcom', - '../../xul', - '../msaa', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/windows/msaa', + '/accessible/xpcom', + '/accessible/xul', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/windows/msaa/ARIAGridAccessibleWrap.cpp rename to accessible/windows/msaa/ARIAGridAccessibleWrap.cpp
rename from accessible/src/windows/msaa/ARIAGridAccessibleWrap.h rename to accessible/windows/msaa/ARIAGridAccessibleWrap.h
rename from accessible/src/windows/msaa/AccessibleWrap.cpp rename to accessible/windows/msaa/AccessibleWrap.cpp
rename from accessible/src/windows/msaa/AccessibleWrap.h rename to accessible/windows/msaa/AccessibleWrap.h
rename from accessible/src/windows/msaa/ApplicationAccessibleWrap.cpp rename to accessible/windows/msaa/ApplicationAccessibleWrap.cpp
rename from accessible/src/windows/msaa/ApplicationAccessibleWrap.h rename to accessible/windows/msaa/ApplicationAccessibleWrap.h
rename from accessible/src/windows/msaa/Compatibility.cpp rename to accessible/windows/msaa/Compatibility.cpp
rename from accessible/src/windows/msaa/Compatibility.h rename to accessible/windows/msaa/Compatibility.h
rename from accessible/src/windows/msaa/DocAccessibleWrap.cpp rename to accessible/windows/msaa/DocAccessibleWrap.cpp
rename from accessible/src/windows/msaa/DocAccessibleWrap.h rename to accessible/windows/msaa/DocAccessibleWrap.h
rename from accessible/src/windows/msaa/EnumVariant.cpp rename to accessible/windows/msaa/EnumVariant.cpp
rename from accessible/src/windows/msaa/EnumVariant.h rename to accessible/windows/msaa/EnumVariant.h
rename from accessible/src/windows/msaa/HTMLTableAccessibleWrap.cpp rename to accessible/windows/msaa/HTMLTableAccessibleWrap.cpp
rename from accessible/src/windows/msaa/HTMLTableAccessibleWrap.h rename to accessible/windows/msaa/HTMLTableAccessibleWrap.h
rename from accessible/src/windows/msaa/HTMLWin32ObjectAccessible.cpp rename to accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp
rename from accessible/src/windows/msaa/HTMLWin32ObjectAccessible.h rename to accessible/windows/msaa/HTMLWin32ObjectAccessible.h
rename from accessible/src/windows/msaa/HyperTextAccessibleWrap.cpp rename to accessible/windows/msaa/HyperTextAccessibleWrap.cpp
rename from accessible/src/windows/msaa/HyperTextAccessibleWrap.h rename to accessible/windows/msaa/HyperTextAccessibleWrap.h
rename from accessible/src/windows/msaa/IUnknownImpl.cpp rename to accessible/windows/msaa/IUnknownImpl.cpp
rename from accessible/src/windows/msaa/IUnknownImpl.h rename to accessible/windows/msaa/IUnknownImpl.h
rename from accessible/src/windows/msaa/ImageAccessibleWrap.cpp rename to accessible/windows/msaa/ImageAccessibleWrap.cpp
rename from accessible/src/windows/msaa/ImageAccessibleWrap.h rename to accessible/windows/msaa/ImageAccessibleWrap.h
rename from accessible/src/windows/msaa/RootAccessibleWrap.cpp rename to accessible/windows/msaa/RootAccessibleWrap.cpp
rename from accessible/src/windows/msaa/RootAccessibleWrap.h rename to accessible/windows/msaa/RootAccessibleWrap.h
rename from accessible/src/windows/msaa/ServiceProvider.cpp rename to accessible/windows/msaa/ServiceProvider.cpp
rename from accessible/src/windows/msaa/ServiceProvider.h rename to accessible/windows/msaa/ServiceProvider.h
rename from accessible/src/windows/msaa/TextLeafAccessibleWrap.cpp rename to accessible/windows/msaa/TextLeafAccessibleWrap.cpp
rename from accessible/src/windows/msaa/TextLeafAccessibleWrap.h rename to accessible/windows/msaa/TextLeafAccessibleWrap.h
rename from accessible/src/windows/msaa/XULListboxAccessibleWrap.cpp rename to accessible/windows/msaa/XULListboxAccessibleWrap.cpp
rename from accessible/src/windows/msaa/XULListboxAccessibleWrap.h rename to accessible/windows/msaa/XULListboxAccessibleWrap.h
rename from accessible/src/windows/msaa/XULMenuAccessibleWrap.cpp rename to accessible/windows/msaa/XULMenuAccessibleWrap.cpp
rename from accessible/src/windows/msaa/XULMenuAccessibleWrap.h rename to accessible/windows/msaa/XULMenuAccessibleWrap.h
rename from accessible/src/windows/msaa/XULTreeGridAccessibleWrap.cpp rename to accessible/windows/msaa/XULTreeGridAccessibleWrap.cpp
rename from accessible/src/windows/msaa/XULTreeGridAccessibleWrap.h rename to accessible/windows/msaa/XULTreeGridAccessibleWrap.h
rename from accessible/src/windows/msaa/moz.build rename to accessible/windows/msaa/moz.build --- a/accessible/src/windows/msaa/moz.build +++ b/accessible/windows/msaa/moz.build @@ -40,22 +40,22 @@ SOURCES += [ if CONFIG['MOZ_XUL']: UNIFIED_SOURCES += [ 'XULListboxAccessibleWrap.cpp', 'XULMenuAccessibleWrap.cpp', 'XULTreeGridAccessibleWrap.cpp', ] LOCAL_INCLUDES += [ - '../../../../content/base/src', - '../../base', - '../../generic', - '../../html', - '../../xpcom', - '../../xul', - '../ia2', - '../sdn', - '../uia', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/windows/ia2', + '/accessible/windows/sdn', + '/accessible/windows/uia', + '/accessible/xpcom', + '/accessible/xul', + '/content/base/src', ] include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul'
rename from accessible/src/windows/msaa/nsWinUtils.cpp rename to accessible/windows/msaa/nsWinUtils.cpp
rename from accessible/src/windows/sdn/moz.build rename to accessible/windows/sdn/moz.build --- a/accessible/src/windows/sdn/moz.build +++ b/accessible/windows/sdn/moz.build @@ -6,21 +6,21 @@ UNIFIED_SOURCES += [ 'sdnAccessible.cpp', 'sdnDocAccessible.cpp', 'sdnTextAccessible.cpp', ] LOCAL_INCLUDES += [ - '../../base', - '../../generic', - '../../html', - '../../xpcom', - '../../xul', - '../msaa', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/windows/msaa', + '/accessible/xpcom', + '/accessible/xul', ] # The midl generated code include Windows headers which defines min and max # macros which conflicts with std::min/max. Suppress the macros: DEFINES['NOMINMAX'] = True FINAL_LIBRARY = 'xul'
rename from accessible/src/windows/sdn/sdnAccessible-inl.h rename to accessible/windows/sdn/sdnAccessible-inl.h
rename from accessible/src/windows/sdn/sdnAccessible.cpp rename to accessible/windows/sdn/sdnAccessible.cpp
rename from accessible/src/windows/sdn/sdnAccessible.h rename to accessible/windows/sdn/sdnAccessible.h
rename from accessible/src/windows/sdn/sdnDocAccessible.cpp rename to accessible/windows/sdn/sdnDocAccessible.cpp
rename from accessible/src/windows/sdn/sdnDocAccessible.h rename to accessible/windows/sdn/sdnDocAccessible.h
rename from accessible/src/windows/sdn/sdnTextAccessible.cpp rename to accessible/windows/sdn/sdnTextAccessible.cpp
rename from accessible/src/windows/sdn/sdnTextAccessible.h rename to accessible/windows/sdn/sdnTextAccessible.h
rename from accessible/src/windows/uia/moz.build rename to accessible/windows/uia/moz.build --- a/accessible/src/windows/uia/moz.build +++ b/accessible/windows/uia/moz.build @@ -4,17 +4,17 @@ # 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/. SOURCES += [ 'uiaRawElmProvider.cpp', ] LOCAL_INCLUDES += [ - '../../base', - '../../generic', - '../../html', - '../../xpcom', - '../../xul', - '../msaa', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/windows/msaa', + '/accessible/xpcom', + '/accessible/xul', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/windows/uia/uiaRawElmProvider.cpp rename to accessible/windows/uia/uiaRawElmProvider.cpp
rename from accessible/src/windows/uia/uiaRawElmProvider.h rename to accessible/windows/uia/uiaRawElmProvider.h
rename from accessible/src/xpcom/moz.build rename to accessible/xpcom/moz.build --- a/accessible/src/xpcom/moz.build +++ b/accessible/xpcom/moz.build @@ -20,30 +20,30 @@ UNIFIED_SOURCES += [ 'xpcAccessibleValue.cpp', ] GENERATED_SOURCES += [ 'xpcAccEvents.cpp', ] LOCAL_INCLUDES += [ - '../base', - '../generic', + '/accessible/base', + '/accessible/generic', ] if CONFIG['MOZ_ENABLE_GTK']: LOCAL_INCLUDES += [ - '../atk', + '/accessible/atk', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += [ - '../windows/msaa', + '/accessible/windows/msaa', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ - '../mac', + '/accessible/mac', ] else: LOCAL_INCLUDES += [ - '../other', + '/accessible/other', ] FINAL_LIBRARY = 'xul'
rename from accessible/src/xpcom/nsAccessibleRelation.cpp rename to accessible/xpcom/nsAccessibleRelation.cpp
rename from accessible/src/xpcom/nsAccessibleRelation.h rename to accessible/xpcom/nsAccessibleRelation.h
rename from accessible/src/xpcom/xpcAccessibleHyperText.cpp rename to accessible/xpcom/xpcAccessibleHyperText.cpp
rename from accessible/src/xpcom/xpcAccessibleHyperText.h rename to accessible/xpcom/xpcAccessibleHyperText.h
rename from accessible/src/xpcom/xpcAccessibleSelectable.cpp rename to accessible/xpcom/xpcAccessibleSelectable.cpp
rename from accessible/src/xpcom/xpcAccessibleSelectable.h rename to accessible/xpcom/xpcAccessibleSelectable.h
rename from accessible/src/xpcom/xpcAccessibleTable.cpp rename to accessible/xpcom/xpcAccessibleTable.cpp
rename from accessible/src/xpcom/xpcAccessibleTable.h rename to accessible/xpcom/xpcAccessibleTable.h
rename from accessible/src/xpcom/xpcAccessibleTableCell.cpp rename to accessible/xpcom/xpcAccessibleTableCell.cpp
rename from accessible/src/xpcom/xpcAccessibleTableCell.h rename to accessible/xpcom/xpcAccessibleTableCell.h
rename from accessible/src/xpcom/xpcAccessibleTextRange.cpp rename to accessible/xpcom/xpcAccessibleTextRange.cpp
rename from accessible/src/xpcom/xpcAccessibleTextRange.h rename to accessible/xpcom/xpcAccessibleTextRange.h
rename from accessible/src/xpcom/xpcAccessibleValue.cpp rename to accessible/xpcom/xpcAccessibleValue.cpp
rename from accessible/src/xpcom/xpcAccessibleValue.h rename to accessible/xpcom/xpcAccessibleValue.h
rename from accessible/src/xul/XULAlertAccessible.cpp rename to accessible/xul/XULAlertAccessible.cpp
rename from accessible/src/xul/XULColorPickerAccessible.cpp rename to accessible/xul/XULColorPickerAccessible.cpp
rename from accessible/src/xul/XULColorPickerAccessible.h rename to accessible/xul/XULColorPickerAccessible.h
rename from accessible/src/xul/XULComboboxAccessible.cpp rename to accessible/xul/XULComboboxAccessible.cpp
rename from accessible/src/xul/XULComboboxAccessible.h rename to accessible/xul/XULComboboxAccessible.h
rename from accessible/src/xul/XULElementAccessibles.cpp rename to accessible/xul/XULElementAccessibles.cpp
rename from accessible/src/xul/XULElementAccessibles.h rename to accessible/xul/XULElementAccessibles.h
rename from accessible/src/xul/XULFormControlAccessible.cpp rename to accessible/xul/XULFormControlAccessible.cpp
rename from accessible/src/xul/XULFormControlAccessible.h rename to accessible/xul/XULFormControlAccessible.h
rename from accessible/src/xul/XULListboxAccessible.cpp rename to accessible/xul/XULListboxAccessible.cpp
rename from accessible/src/xul/XULListboxAccessible.h rename to accessible/xul/XULListboxAccessible.h
rename from accessible/src/xul/XULSelectControlAccessible.cpp rename to accessible/xul/XULSelectControlAccessible.cpp
rename from accessible/src/xul/XULSelectControlAccessible.h rename to accessible/xul/XULSelectControlAccessible.h
rename from accessible/src/xul/XULSliderAccessible.cpp rename to accessible/xul/XULSliderAccessible.cpp
rename from accessible/src/xul/XULTreeGridAccessible.cpp rename to accessible/xul/XULTreeGridAccessible.cpp
rename from accessible/src/xul/XULTreeGridAccessible.h rename to accessible/xul/XULTreeGridAccessible.h
rename from accessible/src/xul/moz.build rename to accessible/xul/moz.build --- a/accessible/src/xul/moz.build +++ b/accessible/xul/moz.build @@ -15,36 +15,36 @@ UNIFIED_SOURCES += [ 'XULSelectControlAccessible.cpp', 'XULSliderAccessible.cpp', 'XULTabAccessible.cpp', 'XULTreeAccessible.cpp', 'XULTreeGridAccessible.cpp', ] LOCAL_INCLUDES += [ - '../../../layout/generic', - '../../../layout/xul', - '../../../layout/xul/tree', - '../base', - '../generic', - '../html', - '../xpcom', + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/xpcom', + '/layout/generic', + '/layout/xul', + '/layout/xul/tree', ] if CONFIG['MOZ_ENABLE_GTK']: LOCAL_INCLUDES += [ - '../atk', + '/accessible/atk', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += [ - '../windows/ia2', - '../windows/msaa', + '/accessible/windows/ia2', + '/accessible/windows/msaa', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ - '../mac', + '/accessible/mac', ] else: LOCAL_INCLUDES += [ - '../other', + '/accessible/other', ] FINAL_LIBRARY = 'xul'