From 24211cd4e287e56d426ec8d7e4eef2bffc7b7d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Mon, 13 Jul 2026 09:42:41 +0000 Subject: [PATCH] Bug 2054311 - Sort includes in accessible/. r=accessibility-platform-reviewers,Jamie Autogenerated with: cp dom/.clang-format accessible/ && mach format accessible/**.{cpp,h,mm} Manual fixes: * Atk individual includes need to become atk/atk.h because otherwise some symbols incorrectly get hidden visibility. Differential Revision: https://phabricator.services.mozilla.com/D311692 --- accessible/.clang-format | 2 + accessible/android/AccessibleWrap.cpp | 27 +++-- accessible/android/AccessibleWrap.h | 3 +- accessible/android/DocAccessibleWrap.cpp | 13 +-- accessible/android/Platform.cpp | 5 +- accessible/android/SessionAccessibility.cpp | 30 +++--- accessible/android/TraversalRule.cpp | 5 +- accessible/aom/AccessibleNode.cpp | 13 ++- accessible/aom/AccessibleNode.h | 6 +- accessible/atk/AccessibleWrap.cpp | 32 +++--- accessible/atk/AccessibleWrap.h | 2 +- accessible/atk/ApplicationAccessibleWrap.cpp | 6 +- accessible/atk/DOMtoATK.cpp | 1 + accessible/atk/DOMtoATK.h | 3 +- accessible/atk/DocAccessibleWrap.cpp | 1 + accessible/atk/RootAccessibleWrap.cpp | 4 +- accessible/atk/UtilInterface.cpp | 9 +- accessible/atk/nsMai.h | 2 +- accessible/atk/nsMaiHyperlink.cpp | 3 +- accessible/atk/nsMaiHyperlink.h | 2 +- accessible/atk/nsMaiInterfaceAction.cpp | 7 +- accessible/atk/nsMaiInterfaceComponent.cpp | 11 +- accessible/atk/nsMaiInterfaceDocument.cpp | 11 +- accessible/atk/nsMaiInterfaceEditableText.cpp | 9 +- .../atk/nsMaiInterfaceHyperlinkImpl.cpp | 3 +- accessible/atk/nsMaiInterfaceHypertext.cpp | 9 +- accessible/atk/nsMaiInterfaceImage.cpp | 7 +- accessible/atk/nsMaiInterfaceSelection.cpp | 10 +- accessible/atk/nsMaiInterfaceTable.cpp | 8 +- accessible/atk/nsMaiInterfaceTableCell.cpp | 6 +- accessible/atk/nsMaiInterfaceText.cpp | 17 ++- accessible/atk/nsMaiInterfaceValue.cpp | 5 +- accessible/atk/nsStateMap.h | 3 +- accessible/base/ARIAMap.cpp | 15 ++- accessible/base/ARIAMap.h | 1 - accessible/base/ARIAStateMap.cpp | 3 +- accessible/base/AccAttributes.cpp | 1 + accessible/base/AccAttributes.h | 8 +- accessible/base/AccEvent.cpp | 10 +- accessible/base/AccEvent.h | 3 +- accessible/base/AccGroupInfo.cpp | 9 +- accessible/base/AccGroupInfo.h | 2 +- accessible/base/AccIterator.cpp | 5 +- accessible/base/AccIterator.h | 8 +- accessible/base/Asserts.cpp | 4 +- accessible/base/CacheConstants.cpp | 1 + accessible/base/CacheConstants.h | 2 +- accessible/base/CachedTableAccessible.cpp | 6 +- accessible/base/CachedTableAccessible.h | 2 +- accessible/base/CssAltContent.cpp | 1 + accessible/base/DocManager.cpp | 4 +- accessible/base/DocManager.h | 8 +- accessible/base/EventQueue.cpp | 5 +- accessible/base/EventTree.h | 1 - accessible/base/FocusManager.cpp | 13 ++- accessible/base/Logging.cpp | 21 ++-- accessible/base/Logging.h | 4 +- accessible/base/NotificationController.cpp | 12 +-- accessible/base/NotificationController.h | 5 +- accessible/base/Pivot.cpp | 3 +- accessible/base/Pivot.h | 1 + accessible/base/Platform.h | 3 +- accessible/base/Relation.h | 4 +- accessible/base/SelectionManager.cpp | 15 ++- accessible/base/SelectionManager.h | 2 +- accessible/base/StyleInfo.h | 4 +- accessible/base/TextAttrs.cpp | 11 +- accessible/base/TextLeafRange.cpp | 16 +-- accessible/base/TextLeafRange.h | 2 +- accessible/base/TextRange.cpp | 5 +- accessible/base/TextUpdater.cpp | 3 +- accessible/base/TreeWalker.cpp | 5 +- accessible/base/TreeWalker.h | 1 + accessible/base/nsAccUtils.cpp | 17 ++- accessible/base/nsAccUtils.h | 4 +- accessible/base/nsAccessibilityService.cpp | 53 +++++----- accessible/base/nsAccessibilityService.h | 9 +- accessible/base/nsCoreUtils.cpp | 45 ++++---- accessible/base/nsCoreUtils.h | 7 +- accessible/base/nsEventShell.cpp | 3 +- accessible/base/nsTextEquivUtils.cpp | 4 +- accessible/basetypes/Accessible.cpp | 9 +- accessible/basetypes/Accessible.h | 8 +- .../basetypes/HyperTextAccessibleBase.cpp | 4 +- accessible/basetypes/TableCellAccessible.h | 3 +- accessible/generic/ARIAGridAccessible.cpp | 9 +- accessible/generic/ApplicationAccessible.cpp | 9 +- accessible/generic/ApplicationAccessible.h | 1 - accessible/generic/DocAccessible-inl.h | 2 +- accessible/generic/DocAccessible.cpp | 53 +++++----- accessible/generic/DocAccessible.h | 9 +- accessible/generic/FormControlAccessible.cpp | 2 +- accessible/generic/HyperTextAccessible-inl.h | 9 +- accessible/generic/HyperTextAccessible.cpp | 34 +++--- accessible/generic/ImageAccessible.cpp | 13 ++- accessible/generic/LocalAccessible-inl.h | 6 +- accessible/generic/LocalAccessible.cpp | 100 ++++++++---------- accessible/generic/LocalAccessible.h | 10 +- accessible/generic/OuterDocAccessible.cpp | 4 +- accessible/generic/RootAccessible.cpp | 35 +++--- accessible/generic/RootAccessible.h | 3 +- accessible/html/HTMLElementAccessibles.cpp | 13 ++- accessible/html/HTMLFormControlAccessible.cpp | 22 ++-- accessible/html/HTMLFormControlAccessible.h | 4 +- accessible/html/HTMLImageMapAccessible.cpp | 3 +- accessible/html/HTMLLinkAccessible.cpp | 9 +- accessible/html/HTMLListAccessible.cpp | 5 +- accessible/html/HTMLSelectAccessible.cpp | 13 ++- accessible/html/HTMLTableAccessible.cpp | 17 ++- accessible/ios/AccessibleWrap.h | 2 +- accessible/ipc/DocAccessibleChild.cpp | 10 +- accessible/ipc/DocAccessibleParent.cpp | 21 ++-- accessible/ipc/DocAccessibleParent.h | 2 +- accessible/ipc/IPCTypes.h | 12 +-- accessible/ipc/RemoteAccessible.cpp | 15 +-- accessible/ipc/RemoteAccessible.h | 6 +- accessible/mac/AccessibleWrap.h | 2 - accessible/other/AccessibleWrap.h | 2 +- accessible/pdf/PdfStructTreeBuilder.cpp | 11 +- accessible/windows/ia2/ia2Accessible.cpp | 21 ++-- accessible/windows/ia2/ia2Accessible.h | 3 +- .../windows/ia2/ia2AccessibleAction.cpp | 1 - accessible/windows/ia2/ia2AccessibleAction.h | 5 +- .../windows/ia2/ia2AccessibleComponent.cpp | 4 +- .../windows/ia2/ia2AccessibleEditableText.cpp | 3 +- .../windows/ia2/ia2AccessibleEditableText.h | 3 +- .../windows/ia2/ia2AccessibleHyperlink.cpp | 1 - .../windows/ia2/ia2AccessibleHyperlink.h | 5 +- .../windows/ia2/ia2AccessibleHypertext.cpp | 6 +- .../windows/ia2/ia2AccessibleHypertext.h | 9 +- accessible/windows/ia2/ia2AccessibleImage.cpp | 4 +- .../windows/ia2/ia2AccessibleRelation.cpp | 3 +- .../windows/ia2/ia2AccessibleRelation.h | 11 +- accessible/windows/ia2/ia2AccessibleTable.cpp | 3 +- accessible/windows/ia2/ia2AccessibleTable.h | 2 +- .../windows/ia2/ia2AccessibleTableCell.cpp | 1 - .../windows/ia2/ia2AccessibleTableCell.h | 2 +- accessible/windows/ia2/ia2AccessibleText.cpp | 7 +- .../ia2AccessibleTextSelectionContainer.cpp | 4 +- accessible/windows/ia2/ia2AccessibleValue.cpp | 3 +- accessible/windows/ia2/ia2AccessibleValue.h | 2 +- accessible/windows/msaa/AccessibleWrap.cpp | 1 + .../msaa/ApplicationAccessibleWrap.cpp | 6 +- accessible/windows/msaa/Compatibility.cpp | 15 ++- accessible/windows/msaa/Compatibility.h | 8 +- accessible/windows/msaa/CompatibilityUIA.cpp | 8 +- accessible/windows/msaa/DocAccessibleWrap.cpp | 6 +- accessible/windows/msaa/LazyInstantiator.cpp | 20 ++-- accessible/windows/msaa/LazyInstantiator.h | 14 +-- accessible/windows/msaa/MsaaAccessible.cpp | 29 ++--- accessible/windows/msaa/MsaaAccessible.h | 11 +- accessible/windows/msaa/MsaaDocAccessible.cpp | 14 +-- accessible/windows/msaa/MsaaDocAccessible.h | 4 +- accessible/windows/msaa/MsaaIdGenerator.cpp | 2 +- accessible/windows/msaa/MsaaIdGenerator.h | 3 +- .../windows/msaa/MsaaRootAccessible.cpp | 13 +-- accessible/windows/msaa/MsaaRootAccessible.h | 2 +- .../windows/msaa/MsaaXULMenuAccessible.cpp | 7 +- accessible/windows/msaa/Platform.cpp | 8 +- accessible/windows/msaa/ServiceProvider.cpp | 10 +- accessible/windows/msaa/nsEventMap.h | 1 + accessible/windows/msaa/nsWinUtils.cpp | 9 +- accessible/windows/msaa/nsWinUtils.h | 5 +- accessible/windows/sdn/sdnAccessible.cpp | 16 +-- accessible/windows/sdn/sdnAccessible.h | 15 ++- accessible/windows/uia/UiaGrid.cpp | 5 +- accessible/windows/uia/UiaGridItem.cpp | 3 +- accessible/windows/uia/UiaText.cpp | 2 +- accessible/windows/uia/UiaText.h | 5 +- accessible/windows/uia/UiaTextRange.cpp | 10 +- accessible/windows/uia/uiaRawElmProvider.cpp | 18 ++-- accessible/xpcom/nsAccessibleRelation.cpp | 3 +- accessible/xpcom/nsAccessibleRelation.h | 9 +- accessible/xpcom/xpcAccessibilityService.cpp | 3 +- accessible/xpcom/xpcAccessible.cpp | 9 +- accessible/xpcom/xpcAccessibleApplication.h | 2 +- accessible/xpcom/xpcAccessibleDocument.cpp | 8 +- accessible/xpcom/xpcAccessibleDocument.h | 3 +- accessible/xpcom/xpcAccessibleGeneric.h | 7 +- accessible/xpcom/xpcAccessibleHyperLink.h | 3 +- accessible/xpcom/xpcAccessibleHyperText.cpp | 5 +- accessible/xpcom/xpcAccessibleHyperText.h | 7 +- accessible/xpcom/xpcAccessibleImage.h | 1 - accessible/xpcom/xpcAccessibleMacInterface.mm | 6 +- accessible/xpcom/xpcAccessiblePivot.cpp | 2 +- accessible/xpcom/xpcAccessiblePivot.h | 3 +- accessible/xpcom/xpcAccessibleSelectable.cpp | 3 +- accessible/xpcom/xpcAccessibleTable.cpp | 3 +- accessible/xpcom/xpcAccessibleTableCell.cpp | 3 +- accessible/xpcom/xpcAccessibleTableCell.h | 1 - .../xpcom/xpcAccessibleTextLeafRange.cpp | 2 +- accessible/xpcom/xpcAccessibleTextRange.cpp | 1 - accessible/xpcom/xpcAccessibleValue.cpp | 4 +- accessible/xul/XULAlertAccessible.cpp | 2 +- accessible/xul/XULComboboxAccessible.cpp | 12 +-- accessible/xul/XULElementAccessibles.cpp | 10 +- accessible/xul/XULFormControlAccessible.cpp | 11 +- accessible/xul/XULListboxAccessible.cpp | 11 +- accessible/xul/XULListboxAccessible.h | 2 +- accessible/xul/XULMenuAccessible.cpp | 26 +++-- accessible/xul/XULSelectControlAccessible.cpp | 8 +- accessible/xul/XULTabAccessible.cpp | 13 ++- accessible/xul/XULTreeAccessible.cpp | 19 ++-- accessible/xul/XULTreeAccessible.h | 2 +- accessible/xul/XULTreeGridAccessible.cpp | 28 ++--- accessible/xul/XULTreeGridAccessible.h | 2 +- 206 files changed, 818 insertions(+), 927 deletions(-) create mode 100644 accessible/.clang-format diff --git a/accessible/.clang-format b/accessible/.clang-format new file mode 100644 index 000000000000..9a2fff9ee2c6 --- /dev/null +++ b/accessible/.clang-format @@ -0,0 +1,2 @@ +BasedOnStyle: InheritParentConfig +SortIncludes: true diff --git a/accessible/android/AccessibleWrap.cpp b/accessible/android/AccessibleWrap.cpp index 96ae48631310..4988fdfc4121 100644 --- a/accessible/android/AccessibleWrap.cpp +++ b/accessible/android/AccessibleWrap.cpp @@ -4,32 +4,31 @@ #include "AccessibleWrap.h" -#include "JavaBuiltins.h" -#include "LocalAccessible-inl.h" -#include "HyperTextAccessible-inl.h" #include "AccAttributes.h" #include "AccEvent.h" #include "AndroidInputType.h" #include "DocAccessibleWrap.h" -#include "SessionAccessibility.h" -#include "TextLeafAccessible.h" -#include "TraversalRule.h" +#include "HyperTextAccessible-inl.h" +#include "JavaBuiltins.h" +#include "LocalAccessible-inl.h" #include "Pivot.h" #include "Platform.h" +#include "RootAccessible.h" +#include "SessionAccessibility.h" +#include "TextLeafAccessible.h" +#include "TextLeafRange.h" +#include "TraversalRule.h" +#include "mozilla/Maybe.h" +#include "mozilla/a11y/DocAccessibleParent.h" +#include "mozilla/a11y/PDocAccessibleChild.h" +#include "mozilla/jni/GeckoBundleUtils.h" +#include "nsAccUtils.h" #include "nsAccessibilityService.h" #include "nsEventShell.h" #include "nsIAccessibleAnnouncementEvent.h" #include "nsIAccessiblePivot.h" -#include "nsAccUtils.h" #include "nsTextEquivUtils.h" #include "nsWhitespaceTokenizer.h" -#include "RootAccessible.h" -#include "TextLeafRange.h" - -#include "mozilla/a11y/PDocAccessibleChild.h" -#include "mozilla/jni/GeckoBundleUtils.h" -#include "mozilla/a11y/DocAccessibleParent.h" -#include "mozilla/Maybe.h" // icu TRUE conflicting with java::sdk::Boolean::TRUE() // https://searchfox.org/mozilla-central/rev/ce02064d8afc8673cef83c92896ee873bd35e7ae/intl/icu/source/common/unicode/umachine.h#265 diff --git a/accessible/android/AccessibleWrap.h b/accessible/android/AccessibleWrap.h index dae4d90a264e..e3e1ff1ac2e0 100644 --- a/accessible/android/AccessibleWrap.h +++ b/accessible/android/AccessibleWrap.h @@ -19,8 +19,7 @@ class AccessibleWrap : public LocalAccessible { virtual ~AccessibleWrap(); MOZ_CAN_RUN_SCRIPT_BOUNDARY // TODO: Mark this as MOZ_CAN_RUN_SCRIPT - virtual nsresult - HandleAccEvent(AccEvent* aEvent) override; + virtual nsresult HandleAccEvent(AccEvent* aEvent) override; virtual void Shutdown() override; diff --git a/accessible/android/DocAccessibleWrap.cpp b/accessible/android/DocAccessibleWrap.cpp index 13b9247cdf0a..6bd310d930f6 100644 --- a/accessible/android/DocAccessibleWrap.cpp +++ b/accessible/android/DocAccessibleWrap.cpp @@ -2,18 +2,19 @@ * 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 "LocalAccessible-inl.h" +#include "DocAccessibleWrap.h" + #include "AccAttributes.h" #include "DocAccessibleChild.h" -#include "DocAccessibleWrap.h" -#include "nsIDocShell.h" -#include "nsLayoutUtils.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" +#include "LocalAccessible-inl.h" #include "Pivot.h" #include "SessionAccessibility.h" #include "TraversalRule.h" #include "mozilla/PresShell.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsIDocShell.h" +#include "nsLayoutUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/android/Platform.cpp b/accessible/android/Platform.cpp index 6abfa7a71900..fbd0397bd707 100644 --- a/accessible/android/Platform.cpp +++ b/accessible/android/Platform.cpp @@ -3,14 +3,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Platform.h" + #include "DocAccessibleWrap.h" #include "SessionAccessibility.h" -#include "mozilla/a11y/RemoteAccessible.h" +#include "TextLeafRange.h" #include "mozilla/Components.h" +#include "mozilla/a11y/RemoteAccessible.h" #include "nsIAccessibleEvent.h" #include "nsIAccessiblePivot.h" #include "nsIStringBundle.h" -#include "TextLeafRange.h" #define ROLE_STRINGS_URL "chrome://global/locale/AccessFu.properties" diff --git a/accessible/android/SessionAccessibility.cpp b/accessible/android/SessionAccessibility.cpp index 6b9f11b8160f..734f20a6937b 100644 --- a/accessible/android/SessionAccessibility.cpp +++ b/accessible/android/SessionAccessibility.cpp @@ -3,33 +3,33 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "SessionAccessibility.h" -#include "LocalAccessible-inl.h" -#include "AndroidUiThread.h" -#include "AndroidBridge.h" -#include "DocAccessibleParent.h" -#include "IDSet.h" -#include "nsThreadUtils.h" + #include "AccAttributes.h" #include "AccessibilityEvent.h" +#include "AndroidBridge.h" +#include "AndroidUiThread.h" +#include "DocAccessibleParent.h" #include "DocAccessibleWrap.h" +#include "IDSet.h" #include "JavaBuiltins.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" - +#include "LocalAccessible-inl.h" +#include "mozilla/MouseEvents.h" #include "mozilla/PresShell.h" -#include "mozilla/dom/BrowserParent.h" -#include "mozilla/dom/CanonicalBrowsingContext.h" -#include "mozilla/dom/Document.h" -#include "mozilla/dom/DocumentInlines.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/DocManager.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" +#include "mozilla/dom/BrowserParent.h" +#include "mozilla/dom/CanonicalBrowsingContext.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/DocumentInlines.h" +#include "mozilla/dom/MouseEventBinding.h" #include "mozilla/jni/GeckoBundleUtils.h" #include "mozilla/jni/NativesInlines.h" #include "mozilla/widget/GeckoViewSupport.h" -#include "mozilla/MouseEvents.h" -#include "mozilla/dom/MouseEventBinding.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsThreadUtils.h" #ifdef DEBUG # include diff --git a/accessible/android/TraversalRule.cpp b/accessible/android/TraversalRule.cpp index 65bd1ab0988a..35ea26777c5a 100644 --- a/accessible/android/TraversalRule.cpp +++ b/accessible/android/TraversalRule.cpp @@ -4,11 +4,10 @@ #include "TraversalRule.h" -#include "mozilla/a11y/Accessible.h" - -#include "mozilla/a11y/Role.h" #include "HTMLListAccessible.h" #include "SessionAccessibility.h" +#include "mozilla/a11y/Accessible.h" +#include "mozilla/a11y/Role.h" #include "nsAccUtils.h" #include "nsIAccessiblePivot.h" diff --git a/accessible/aom/AccessibleNode.cpp b/accessible/aom/AccessibleNode.cpp index 5d6d5a6ca80b..e7e6140742df 100644 --- a/accessible/aom/AccessibleNode.cpp +++ b/accessible/aom/AccessibleNode.cpp @@ -3,17 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccessibleNode.h" + +#include "DocAccessible.h" +#include "LocalAccessible-inl.h" +#include "mozilla/StaticPrefs_accessibility.h" #include "mozilla/dom/AccessibleNodeBinding.h" #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/DOMStringList.h" -#include "mozilla/StaticPrefs_accessibility.h" -#include "nsContentUtils.h" - -#include "LocalAccessible-inl.h" -#include "nsAccessibilityService.h" -#include "DocAccessible.h" - #include "mozilla/dom/ToJSValue.h" +#include "nsAccessibilityService.h" +#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/aom/AccessibleNode.h b/accessible/aom/AccessibleNode.h index 51db02acb981..edb815596cba 100644 --- a/accessible/aom/AccessibleNode.h +++ b/accessible/aom/AccessibleNode.h @@ -5,12 +5,12 @@ #ifndef A11Y_AOM_ACCESSIBLENODE_H #define A11Y_AOM_ACCESSIBLENODE_H -#include "nsTHashMap.h" -#include "nsRefPtrHashtable.h" -#include "nsWrapperCache.h" #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/DOMString.h" #include "mozilla/dom/Nullable.h" +#include "nsRefPtrHashtable.h" +#include "nsTHashMap.h" +#include "nsWrapperCache.h" class nsINode; diff --git a/accessible/atk/AccessibleWrap.cpp b/accessible/atk/AccessibleWrap.cpp index 27d98894674f..1017f3f0af0a 100644 --- a/accessible/atk/AccessibleWrap.cpp +++ b/accessible/atk/AccessibleWrap.cpp @@ -4,32 +4,30 @@ #include "AccessibleWrap.h" -#include "LocalAccessible-inl.h" #include "AccAttributes.h" #include "ApplicationAccessibleWrap.h" -#include "InterfaceInitFuncs.h" -#include "nsAccUtils.h" -#include "mozilla/a11y/PDocAccessible.h" -#include "OuterDocAccessible.h" -#include "RemoteAccessible.h" #include "DocAccessibleParent.h" -#include "RootAccessible.h" -#include "mozilla/a11y/TableAccessible.h" -#include "mozilla/a11y/TableCellAccessible.h" -#include "nsMai.h" -#include "nsMaiHyperlink.h" -#include "nsString.h" -#include "nsStateMap.h" -#include "mozilla/a11y/Platform.h" +#include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" +#include "OuterDocAccessible.h" #include "Relation.h" +#include "RemoteAccessible.h" #include "RootAccessible.h" #include "States.h" -#include "nsIAccessibleAnnouncementEvent.h" -#include "nsISimpleEnumerator.h" - #include "mozilla/Sprintf.h" +#include "mozilla/a11y/PDocAccessible.h" +#include "mozilla/a11y/Platform.h" +#include "mozilla/a11y/TableAccessible.h" +#include "mozilla/a11y/TableCellAccessible.h" +#include "nsAccUtils.h" #include "nsAccessibilityService.h" #include "nsComponentManagerUtils.h" +#include "nsIAccessibleAnnouncementEvent.h" +#include "nsISimpleEnumerator.h" +#include "nsMai.h" +#include "nsMaiHyperlink.h" +#include "nsStateMap.h" +#include "nsString.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/AccessibleWrap.h b/accessible/atk/AccessibleWrap.h index 3eb950d2a56c..4ab85e30101b 100644 --- a/accessible/atk/AccessibleWrap.h +++ b/accessible/atk/AccessibleWrap.h @@ -5,8 +5,8 @@ #ifndef NS_ACCESSIBLE_WRAP_H_ #define NS_ACCESSIBLE_WRAP_H_ -#include "nsCOMPtr.h" #include "LocalAccessible.h" +#include "nsCOMPtr.h" struct _AtkObject; typedef struct _AtkObject AtkObject; diff --git a/accessible/atk/ApplicationAccessibleWrap.cpp b/accessible/atk/ApplicationAccessibleWrap.cpp index 2654740b557a..2b821a935c9b 100644 --- a/accessible/atk/ApplicationAccessibleWrap.cpp +++ b/accessible/atk/ApplicationAccessibleWrap.cpp @@ -4,11 +4,11 @@ #include "ApplicationAccessibleWrap.h" -#include "nsMai.h" -#include "nsAccessibilityService.h" - #include + #include "atk/atkobject.h" +#include "nsAccessibilityService.h" +#include "nsMai.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/DOMtoATK.cpp b/accessible/atk/DOMtoATK.cpp index eb21b8d659c7..0b2f334eac51 100644 --- a/accessible/atk/DOMtoATK.cpp +++ b/accessible/atk/DOMtoATK.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "DOMtoATK.h" + #include "nsUTF8Utils.h" namespace mozilla::a11y::DOMtoATK { diff --git a/accessible/atk/DOMtoATK.h b/accessible/atk/DOMtoATK.h index 1d3e2f58d540..8d6d9d03769e 100644 --- a/accessible/atk/DOMtoATK.h +++ b/accessible/atk/DOMtoATK.h @@ -6,8 +6,9 @@ #define ACCESSIBLE_ATK_DOMTOATK_H_ #include -#include "mozilla/a11y/HyperTextAccessibleBase.h" + #include "mozilla/Utf16.h" +#include "mozilla/a11y/HyperTextAccessibleBase.h" #include "nsString.h" /** diff --git a/accessible/atk/DocAccessibleWrap.cpp b/accessible/atk/DocAccessibleWrap.cpp index 996a4b4e40f7..bd840a469a07 100644 --- a/accessible/atk/DocAccessibleWrap.cpp +++ b/accessible/atk/DocAccessibleWrap.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "DocAccessibleWrap.h" + #include "mozilla/PresShell.h" #include "nsIWidgetListener.h" #include "nsTArray.h" diff --git a/accessible/atk/RootAccessibleWrap.cpp b/accessible/atk/RootAccessibleWrap.cpp index c043e811c6fc..391cc0bf499c 100644 --- a/accessible/atk/RootAccessibleWrap.cpp +++ b/accessible/atk/RootAccessibleWrap.cpp @@ -4,11 +4,11 @@ #include "RootAccessibleWrap.h" +#include + #include "atk/atkobject.h" #include "nsTArray.h" -#include - using namespace mozilla::a11y; GtkWindowAccessible::GtkWindowAccessible(AtkObject* aAccessible) { diff --git a/accessible/atk/UtilInterface.cpp b/accessible/atk/UtilInterface.cpp index 839b07b73956..3309570257fc 100644 --- a/accessible/atk/UtilInterface.cpp +++ b/accessible/atk/UtilInterface.cpp @@ -2,16 +2,15 @@ * 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 +#include +#include + #include "ApplicationAccessible.h" #include "mozilla/Likely.h" #include "nsAccessibilityService.h" #include "nsMai.h" -#include -#include -#include -#include - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsMai.h b/accessible/atk/nsMai.h index e6ef862aa47d..2ca77f0ca740 100644 --- a/accessible/atk/nsMai.h +++ b/accessible/atk/nsMai.h @@ -6,8 +6,8 @@ #define NS_MAI_H_ #include -#include #include +#include #include "AccessibleWrap.h" diff --git a/accessible/atk/nsMaiHyperlink.cpp b/accessible/atk/nsMaiHyperlink.cpp index adf75b33067a..4255bb37f22e 100644 --- a/accessible/atk/nsMaiHyperlink.cpp +++ b/accessible/atk/nsMaiHyperlink.cpp @@ -2,9 +2,10 @@ * 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 "nsIURI.h" #include "nsMaiHyperlink.h" + #include "mozilla/a11y/RemoteAccessible.h" +#include "nsIURI.h" using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiHyperlink.h b/accessible/atk/nsMaiHyperlink.h index a552d6c15469..2f629758fe9d 100644 --- a/accessible/atk/nsMaiHyperlink.h +++ b/accessible/atk/nsMaiHyperlink.h @@ -5,11 +5,11 @@ #ifndef MAI_HYPERLINK_H_ #define MAI_HYPERLINK_H_ -#include "nsMai.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/LocalAccessible.h" #include "mozilla/a11y/RemoteAccessible.h" #include "nsDebug.h" +#include "nsMai.h" struct _AtkHyperlink; typedef struct _AtkHyperlink AtkHyperlink; diff --git a/accessible/atk/nsMaiInterfaceAction.cpp b/accessible/atk/nsMaiInterfaceAction.cpp index efce708b8a47..c9a920c02565 100644 --- a/accessible/atk/nsMaiInterfaceAction.cpp +++ b/accessible/atk/nsMaiInterfaceAction.cpp @@ -3,13 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "InterfaceInitFuncs.h" - #include "LocalAccessible-inl.h" -#include "nsMai.h" -#include "mozilla/Likely.h" -#include "nsAccessibilityService.h" #include "Relation.h" #include "RemoteAccessible.h" +#include "mozilla/Likely.h" +#include "nsAccessibilityService.h" +#include "nsMai.h" #include "nsString.h" using namespace mozilla; diff --git a/accessible/atk/nsMaiInterfaceComponent.cpp b/accessible/atk/nsMaiInterfaceComponent.cpp index d5c704a4c59c..7444bbfeb19a 100644 --- a/accessible/atk/nsMaiInterfaceComponent.cpp +++ b/accessible/atk/nsMaiInterfaceComponent.cpp @@ -2,19 +2,18 @@ * 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 "InterfaceInitFuncs.h" - -#include "LocalAccessible-inl.h" #include "AccessibleWrap.h" -#include "nsAccUtils.h" -#include "nsMai.h" -#include "nsWindow.h" +#include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" #include "mozilla/Likely.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/RemoteAccessible.h" #include "mozilla/dom/BrowserParent.h" #include "mozilla/dom/Document.h" +#include "nsAccUtils.h" #include "nsAccessibilityService.h" +#include "nsMai.h" +#include "nsWindow.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceDocument.cpp b/accessible/atk/nsMaiInterfaceDocument.cpp index 423671ba108d..892c981910fa 100644 --- a/accessible/atk/nsMaiInterfaceDocument.cpp +++ b/accessible/atk/nsMaiInterfaceDocument.cpp @@ -2,16 +2,15 @@ * 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 "InterfaceInitFuncs.h" - -#include "LocalAccessible-inl.h" #include "AccessibleWrap.h" #include "DocAccessible.h" +#include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" +#include "RemoteAccessible.h" +#include "mozilla/Likely.h" +#include "mozilla/a11y/DocAccessibleParent.h" #include "nsAccUtils.h" #include "nsMai.h" -#include "RemoteAccessible.h" -#include "mozilla/a11y/DocAccessibleParent.h" -#include "mozilla/Likely.h" using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceEditableText.cpp b/accessible/atk/nsMaiInterfaceEditableText.cpp index 681930b12a28..80b9c60d6f3c 100644 --- a/accessible/atk/nsMaiInterfaceEditableText.cpp +++ b/accessible/atk/nsMaiInterfaceEditableText.cpp @@ -2,14 +2,13 @@ * 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 "InterfaceInitFuncs.h" - -#include "LocalAccessible-inl.h" #include "HyperTextAccessible-inl.h" -#include "nsMai.h" +#include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" #include "RemoteAccessible.h" -#include "nsString.h" #include "mozilla/Likely.h" +#include "nsMai.h" +#include "nsString.h" using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp b/accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp index 5395c0e8d813..4ad87842644f 100644 --- a/accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp +++ b/accessible/atk/nsMaiInterfaceHyperlinkImpl.cpp @@ -3,9 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "InterfaceInitFuncs.h" - -#include "nsMaiHyperlink.h" #include "mozilla/Likely.h" +#include "nsMaiHyperlink.h" using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceHypertext.cpp b/accessible/atk/nsMaiInterfaceHypertext.cpp index f7ad9f26c897..dba2e2646835 100644 --- a/accessible/atk/nsMaiInterfaceHypertext.cpp +++ b/accessible/atk/nsMaiInterfaceHypertext.cpp @@ -2,14 +2,13 @@ * 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 "InterfaceInitFuncs.h" - -#include "LocalAccessible-inl.h" #include "HyperTextAccessible.h" -#include "nsMai.h" -#include "nsMaiHyperlink.h" +#include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" #include "RemoteAccessible.h" #include "mozilla/Likely.h" +#include "nsMai.h" +#include "nsMaiHyperlink.h" using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceImage.cpp b/accessible/atk/nsMaiInterfaceImage.cpp index 28dce7729452..abd608a50f98 100644 --- a/accessible/atk/nsMaiInterfaceImage.cpp +++ b/accessible/atk/nsMaiInterfaceImage.cpp @@ -2,13 +2,12 @@ * 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 "InterfaceInitFuncs.h" - #include "AccessibleWrap.h" -#include "mozilla/a11y/Accessible.h" +#include "InterfaceInitFuncs.h" #include "mozilla/Likely.h" -#include "nsMai.h" +#include "mozilla/a11y/Accessible.h" #include "nsIAccessibleTypes.h" +#include "nsMai.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceSelection.cpp b/accessible/atk/nsMaiInterfaceSelection.cpp index fac25f0de896..1eab5bdacec0 100644 --- a/accessible/atk/nsMaiInterfaceSelection.cpp +++ b/accessible/atk/nsMaiInterfaceSelection.cpp @@ -2,15 +2,13 @@ * 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 "InterfaceInitFuncs.h" +#include -#include "LocalAccessible-inl.h" #include "AccessibleWrap.h" -#include "nsMai.h" +#include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" #include "mozilla/Likely.h" - -#include -#include +#include "nsMai.h" using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceTable.cpp b/accessible/atk/nsMaiInterfaceTable.cpp index 5fcba78a0f80..7e1ac2a77fa0 100644 --- a/accessible/atk/nsMaiInterfaceTable.cpp +++ b/accessible/atk/nsMaiInterfaceTable.cpp @@ -2,17 +2,15 @@ * 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 "InterfaceInitFuncs.h" - #include "AccessibleWrap.h" +#include "InterfaceInitFuncs.h" +#include "RemoteAccessible.h" +#include "mozilla/Likely.h" #include "mozilla/a11y/TableAccessible.h" #include "nsAccessibilityService.h" #include "nsMai.h" -#include "RemoteAccessible.h" #include "nsTArray.h" -#include "mozilla/Likely.h" - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceTableCell.cpp b/accessible/atk/nsMaiInterfaceTableCell.cpp index 74dff9e3998d..3cb3fb2d1df7 100644 --- a/accessible/atk/nsMaiInterfaceTableCell.cpp +++ b/accessible/atk/nsMaiInterfaceTableCell.cpp @@ -3,16 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "InterfaceInitFuncs.h" - +#include "RemoteAccessible.h" +#include "mozilla/Likely.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" #include "nsAccessibilityService.h" #include "nsMai.h" -#include "RemoteAccessible.h" #include "nsTArray.h" -#include "mozilla/Likely.h" - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceText.cpp b/accessible/atk/nsMaiInterfaceText.cpp index f8dafd456acd..df560094880c 100644 --- a/accessible/atk/nsMaiInterfaceText.cpp +++ b/accessible/atk/nsMaiInterfaceText.cpp @@ -2,23 +2,20 @@ * 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 "AccAttributes.h" +#include "DOMtoATK.h" +#include "HyperTextAccessible-inl.h" #include "InterfaceInitFuncs.h" +#include "LocalAccessible-inl.h" +#include "RemoteAccessible.h" +#include "mozilla/Likely.h" #include "mozilla/a11y/PDocAccessible.h" #include "nsAccessibilityService.h" -#include "LocalAccessible-inl.h" -#include "HyperTextAccessible-inl.h" -#include "nsMai.h" -#include "RemoteAccessible.h" -#include "AccAttributes.h" - #include "nsIAccessibleTypes.h" #include "nsISimpleEnumerator.h" +#include "nsMai.h" #include "nsUTF8Utils.h" -#include "mozilla/Likely.h" - -#include "DOMtoATK.h" - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsMaiInterfaceValue.cpp b/accessible/atk/nsMaiInterfaceValue.cpp index 557cbe02b336..913c14f05b1a 100644 --- a/accessible/atk/nsMaiInterfaceValue.cpp +++ b/accessible/atk/nsMaiInterfaceValue.cpp @@ -2,12 +2,11 @@ * 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 "InterfaceInitFuncs.h" - #include "AccessibleWrap.h" -#include "nsMai.h" +#include "InterfaceInitFuncs.h" #include "RemoteAccessible.h" #include "mozilla/Likely.h" +#include "nsMai.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/atk/nsStateMap.h b/accessible/atk/nsStateMap.h index 51e10a3adda6..1fc00f9ab9e7 100644 --- a/accessible/atk/nsStateMap.h +++ b/accessible/atk/nsStateMap.h @@ -6,10 +6,11 @@ #define ACCESSIBLE_ATK_NSSTATEMAP_H_ #include -#include "AccessibleWrap.h" #include +#include "AccessibleWrap.h" + // clang-format off /****************************************************************************** The following accessible states aren't translated, just ignored: diff --git a/accessible/base/ARIAMap.cpp b/accessible/base/ARIAMap.cpp index 60542a1faed4..3853b1eaa77c 100644 --- a/accessible/base/ARIAMap.cpp +++ b/accessible/base/ARIAMap.cpp @@ -5,20 +5,17 @@ #include "ARIAMap.h" #include "AccAttributes.h" -#include "nsAccUtils.h" -#include "nsCoreUtils.h" -#include "mozilla/a11y/Role.h" #include "States.h" - -#include "nsAttrName.h" -#include "nsGenericHTMLElement.h" -#include "nsWhitespaceTokenizer.h" - #include "mozilla/BinarySearch.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" - +#include "nsAccUtils.h" +#include "nsAttrName.h" +#include "nsCoreUtils.h" +#include "nsGenericHTMLElement.h" #include "nsUnicharUtils.h" +#include "nsWhitespaceTokenizer.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/ARIAMap.h b/accessible/base/ARIAMap.h index edc13d80d681..b9c41a834b83 100644 --- a/accessible/base/ARIAMap.h +++ b/accessible/base/ARIAMap.h @@ -9,7 +9,6 @@ #include "mozilla/a11y/AccTypes.h" #include "mozilla/a11y/DocAccessible.h" #include "mozilla/a11y/Role.h" - #include "nsAtom.h" #include "nsIContent.h" #include "nsTHashSet.h" diff --git a/accessible/base/ARIAStateMap.cpp b/accessible/base/ARIAStateMap.cpp index 3087fc58eaa1..7f43a4ef20ac 100644 --- a/accessible/base/ARIAStateMap.cpp +++ b/accessible/base/ARIAStateMap.cpp @@ -3,10 +3,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ARIAMap.h" -#include "nsAccUtils.h" #include "States.h" - #include "mozilla/dom/Element.h" +#include "nsAccUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/AccAttributes.cpp b/accessible/base/AccAttributes.cpp index 1d1f5fb0840f..8aa508972110 100644 --- a/accessible/base/AccAttributes.cpp +++ b/accessible/base/AccAttributes.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccAttributes.h" + #include "StyleInfo.h" #include "mozilla/ToString.h" #include "nsAtom.h" diff --git a/accessible/base/AccAttributes.h b/accessible/base/AccAttributes.h index 08f7dce435fd..d7399cc52c60 100644 --- a/accessible/base/AccAttributes.h +++ b/accessible/base/AccAttributes.h @@ -5,12 +5,12 @@ #ifndef AccAttributes_h_ #define AccAttributes_h_ -#include "mozilla/a11y/AccGroupInfo.h" #include "mozilla/Variant.h" -#include "nsTHashMap.h" -#include "nsStringFwd.h" -#include "mozilla/gfx/Matrix.h" #include "mozilla/WritingModes.h" +#include "mozilla/a11y/AccGroupInfo.h" +#include "mozilla/gfx/Matrix.h" +#include "nsStringFwd.h" +#include "nsTHashMap.h" class nsVariant; diff --git a/accessible/base/AccEvent.cpp b/accessible/base/AccEvent.cpp index 85afaba30bd3..cbeb99860feb 100644 --- a/accessible/base/AccEvent.cpp +++ b/accessible/base/AccEvent.cpp @@ -4,18 +4,16 @@ #include "AccEvent.h" -#include "nsAccUtils.h" -#include "xpcAccEvents.h" #include "States.h" #include "TextRange.h" -#include "xpcAccessibleDocument.h" -#include "xpcAccessibleTextRange.h" - #include "mozilla/dom/Selection.h" #include "mozilla/dom/UserActivation.h" - +#include "nsAccUtils.h" #include "nsComponentManagerUtils.h" #include "nsIMutableArray.h" +#include "xpcAccEvents.h" +#include "xpcAccessibleDocument.h" +#include "xpcAccessibleTextRange.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/AccEvent.h b/accessible/base/AccEvent.h index cdce9ceb08c5..f4c4063cd816 100644 --- a/accessible/base/AccEvent.h +++ b/accessible/base/AccEvent.h @@ -5,9 +5,8 @@ #ifndef AccEvent_H_ #define AccEvent_H_ -#include "nsIAccessibleEvent.h" - #include "mozilla/a11y/LocalAccessible.h" +#include "nsIAccessibleEvent.h" class nsEventShell; namespace mozilla { diff --git a/accessible/base/AccGroupInfo.cpp b/accessible/base/AccGroupInfo.cpp index 336ce9ecf504..186d99770938 100644 --- a/accessible/base/AccGroupInfo.cpp +++ b/accessible/base/AccGroupInfo.cpp @@ -3,14 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccGroupInfo.h" -#include "mozilla/a11y/Accessible.h" -#include "mozilla/a11y/TableAccessible.h" - -#include "nsAccUtils.h" -#include "nsIAccessiblePivot.h" #include "Pivot.h" #include "States.h" +#include "mozilla/a11y/Accessible.h" +#include "mozilla/a11y/TableAccessible.h" +#include "nsAccUtils.h" +#include "nsIAccessiblePivot.h" using namespace mozilla::a11y; diff --git a/accessible/base/AccGroupInfo.h b/accessible/base/AccGroupInfo.h index 5605c93e1eb0..0c3a81ab7b39 100644 --- a/accessible/base/AccGroupInfo.h +++ b/accessible/base/AccGroupInfo.h @@ -5,9 +5,9 @@ #ifndef AccGroupInfo_h_ #define AccGroupInfo_h_ -#include "nsISupportsImpl.h" #include "mozilla/MemoryReporting.h" #include "mozilla/a11y/Role.h" +#include "nsISupportsImpl.h" namespace mozilla { namespace a11y { diff --git a/accessible/base/AccIterator.cpp b/accessible/base/AccIterator.cpp index ecc376f782a3..530eb9135aaf 100644 --- a/accessible/base/AccIterator.cpp +++ b/accessible/base/AccIterator.cpp @@ -4,19 +4,18 @@ #include "AccIterator.h" -#include "AccGroupInfo.h" #include "ARIAMap.h" +#include "AccGroupInfo.h" #include "DocAccessible-inl.h" #include "LocalAccessible-inl.h" -#include "nsAccUtils.h" #include "XULTreeAccessible.h" - #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/dom/DocumentOrShadowRoot.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/ElementInternals.h" #include "mozilla/dom/HTMLLabelElement.h" #include "mozilla/dom/TreeOrderedArrayInlines.h" +#include "nsAccUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/AccIterator.h b/accessible/base/AccIterator.h index e428d756f41f..9325edb696b5 100644 --- a/accessible/base/AccIterator.h +++ b/accessible/base/AccIterator.h @@ -5,14 +5,14 @@ #ifndef mozilla_a11y_AccIterator_h_ #define mozilla_a11y_AccIterator_h_ +#include + #include "Filters.h" #include "mozilla/a11y/DocAccessible.h" #include "mozilla/dom/Element.h" -#include "nsTArray.h" -#include "nsContentUtils.h" #include "mozilla/dom/TreeOrderedArray.h" - -#include +#include "nsContentUtils.h" +#include "nsTArray.h" class nsITreeView; diff --git a/accessible/base/Asserts.cpp b/accessible/base/Asserts.cpp index bbed4b484d8c..cb6bf783662f 100644 --- a/accessible/base/Asserts.cpp +++ b/accessible/base/Asserts.cpp @@ -2,10 +2,10 @@ * 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 "nsIAccessibleRelation.h" -#include "nsIAccessibleRole.h" #include "mozilla/a11y/RelationType.h" #include "mozilla/a11y/Role.h" +#include "nsIAccessibleRelation.h" +#include "nsIAccessibleRole.h" using namespace mozilla::a11y; diff --git a/accessible/base/CacheConstants.cpp b/accessible/base/CacheConstants.cpp index 5375ddce5981..5405d091a5c4 100644 --- a/accessible/base/CacheConstants.cpp +++ b/accessible/base/CacheConstants.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "CacheConstants.h" + #include "nsAccessibilityService.h" namespace mozilla::a11y { diff --git a/accessible/base/CacheConstants.h b/accessible/base/CacheConstants.h index 1e67d5fae26d..8689a45a4ea8 100644 --- a/accessible/base/CacheConstants.h +++ b/accessible/base/CacheConstants.h @@ -5,8 +5,8 @@ #ifndef CacheConstants_h_ #define CacheConstants_h_ -#include "nsGkAtoms.h" #include "mozilla/a11y/RelationType.h" +#include "nsGkAtoms.h" namespace mozilla { namespace a11y { diff --git a/accessible/base/CachedTableAccessible.cpp b/accessible/base/CachedTableAccessible.cpp index b3bd5fd00248..2b006013461a 100644 --- a/accessible/base/CachedTableAccessible.cpp +++ b/accessible/base/CachedTableAccessible.cpp @@ -6,15 +6,15 @@ #include "AccIterator.h" #include "HTMLTableAccessible.h" -#include "mozilla/a11y/DocAccessibleParent.h" +#include "Pivot.h" +#include "RemoteAccessible.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/StaticPtr.h" #include "mozilla/UniquePtr.h" +#include "mozilla/a11y/DocAccessibleParent.h" #include "nsAccUtils.h" #include "nsIAccessiblePivot.h" #include "nsThreadUtils.h" -#include "Pivot.h" -#include "RemoteAccessible.h" namespace mozilla::a11y { diff --git a/accessible/base/CachedTableAccessible.h b/accessible/base/CachedTableAccessible.h index b6e0da23a03c..bf5bb11a73f8 100644 --- a/accessible/base/CachedTableAccessible.h +++ b/accessible/base/CachedTableAccessible.h @@ -5,9 +5,9 @@ #ifndef CACHED_TABLE_ACCESSIBLE_H #define CACHED_TABLE_ACCESSIBLE_H +#include "mozilla/UniquePtr.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "mozilla/UniquePtr.h" #include "nsTHashMap.h" namespace mozilla::a11y { diff --git a/accessible/base/CssAltContent.cpp b/accessible/base/CssAltContent.cpp index 309939cfdbd5..a3ee829b024c 100644 --- a/accessible/base/CssAltContent.cpp +++ b/accessible/base/CssAltContent.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "CssAltContent.h" + #include "DocAccessible-inl.h" #include "mozilla/a11y/DocManager.h" #include "mozilla/dom/Document.h" diff --git a/accessible/base/DocManager.cpp b/accessible/base/DocManager.cpp index 0222263d60bb..d28ad42b4aee 100644 --- a/accessible/base/DocManager.cpp +++ b/accessible/base/DocManager.cpp @@ -7,9 +7,9 @@ #include "ApplicationAccessible.h" #include "DocAccessible-inl.h" #include "DocAccessibleParent.h" -#include "nsAccessibilityService.h" #include "Platform.h" #include "RootAccessibleWrap.h" +#include "nsAccessibilityService.h" #ifdef A11Y_LOG # include "Logging.h" @@ -26,12 +26,12 @@ #include "mozilla/StaticPrefs_accessibility.h" #include "mozilla/dom/Event.h" // for Event #include "nsContentUtils.h" +#include "nsCoreUtils.h" #include "nsDocShellLoadTypes.h" #include "nsIChannel.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIWebNavigation.h" #include "nsIWebProgress.h" -#include "nsCoreUtils.h" #include "xpcAccessibleDocument.h" using namespace mozilla; diff --git a/accessible/base/DocManager.h b/accessible/base/DocManager.h index a102e5eba36a..f3c05ff3c100 100644 --- a/accessible/base/DocManager.h +++ b/accessible/base/DocManager.h @@ -6,12 +6,12 @@ #define mozilla_a11_DocManager_h_ #include "mozilla/ClearOnShutdown.h" -#include "nsIDOMEventListener.h" -#include "nsRefPtrHashtable.h" -#include "nsIWebProgressListener.h" -#include "nsWeakReference.h" #include "mozilla/StaticPtr.h" +#include "nsIDOMEventListener.h" #include "nsINode.h" +#include "nsIWebProgressListener.h" +#include "nsRefPtrHashtable.h" +#include "nsWeakReference.h" namespace mozilla::dom { class Document; diff --git a/accessible/base/EventQueue.cpp b/accessible/base/EventQueue.cpp index 05fdc77eb0c5..017302c90802 100644 --- a/accessible/base/EventQueue.cpp +++ b/accessible/base/EventQueue.cpp @@ -4,12 +4,11 @@ #include "EventQueue.h" +#include "DocAccessibleChild.h" +#include "LocalAccessible-inl.h" #include "mozilla/PerfStats.h" #include "mozilla/ProfilerMarkers.h" - -#include "LocalAccessible-inl.h" #include "nsEventShell.h" -#include "DocAccessibleChild.h" #include "nsTextEquivUtils.h" #ifdef A11Y_LOG # include "Logging.h" diff --git a/accessible/base/EventTree.h b/accessible/base/EventTree.h index e610cf406baf..2f24b4f5b6ab 100644 --- a/accessible/base/EventTree.h +++ b/accessible/base/EventTree.h @@ -7,7 +7,6 @@ #include "AccEvent.h" #include "LocalAccessible.h" - #include "mozilla/a11y/DocAccessible.h" namespace mozilla { diff --git a/accessible/base/FocusManager.cpp b/accessible/base/FocusManager.cpp index 571d6b481d33..782deca53f4b 100644 --- a/accessible/base/FocusManager.cpp +++ b/accessible/base/FocusManager.cpp @@ -4,17 +4,16 @@ #include "FocusManager.h" -#include "LocalAccessible-inl.h" #include "DocAccessible-inl.h" +#include "LocalAccessible-inl.h" +#include "mozilla/EventStateManager.h" +#include "mozilla/a11y/DocAccessibleParent.h" +#include "mozilla/dom/BrowserParent.h" +#include "mozilla/dom/BrowsingContext.h" +#include "mozilla/dom/Element.h" #include "nsAccessibilityService.h" #include "nsEventShell.h" - #include "nsFocusManager.h" -#include "mozilla/a11y/DocAccessibleParent.h" -#include "mozilla/EventStateManager.h" -#include "mozilla/dom/Element.h" -#include "mozilla/dom/BrowsingContext.h" -#include "mozilla/dom/BrowserParent.h" namespace mozilla { namespace a11y { diff --git a/accessible/base/Logging.cpp b/accessible/base/Logging.cpp index c26fa1dae26d..18be12004bd4 100644 --- a/accessible/base/Logging.cpp +++ b/accessible/base/Logging.cpp @@ -4,20 +4,11 @@ #include "Logging.h" -#include "LocalAccessible-inl.h" #include "AccEvent.h" -#include "DocAccessible.h" #include "DocAccessible-inl.h" -#include "nsAccessibilityService.h" -#include "nsCoreUtils.h" +#include "DocAccessible.h" +#include "LocalAccessible-inl.h" #include "OuterDocAccessible.h" - -#include "nsDocShellLoadTypes.h" -#include "nsIChannel.h" -#include "nsIWebProgress.h" -#include "prenv.h" -#include "nsIDocShellTreeItem.h" -#include "nsPIDOMWindowInlines.h" #include "mozilla/Maybe.h" #include "mozilla/PresShell.h" #include "mozilla/ScrollContainerFrame.h" @@ -28,6 +19,14 @@ #include "mozilla/dom/Element.h" #include "mozilla/dom/HTMLBodyElement.h" #include "mozilla/dom/Selection.h" +#include "nsAccessibilityService.h" +#include "nsCoreUtils.h" +#include "nsDocShellLoadTypes.h" +#include "nsIChannel.h" +#include "nsIDocShellTreeItem.h" +#include "nsIWebProgress.h" +#include "nsPIDOMWindowInlines.h" +#include "prenv.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/Logging.h b/accessible/base/Logging.h index 61f7fd4cbbed..8ea84d4b434f 100644 --- a/accessible/base/Logging.h +++ b/accessible/base/Logging.h @@ -5,9 +5,9 @@ #ifndef mozilla_a11y_logs_h_ #define mozilla_a11y_logs_h_ -#include "nscore.h" -#include "nsStringFwd.h" #include "mozilla/Attributes.h" +#include "nsStringFwd.h" +#include "nscore.h" class nsINode; class nsIRequest; diff --git a/accessible/base/NotificationController.cpp b/accessible/base/NotificationController.cpp index d197df301d46..801ce4941cf1 100644 --- a/accessible/base/NotificationController.cpp +++ b/accessible/base/NotificationController.cpp @@ -8,20 +8,18 @@ #include "DocAccessible-inl.h" #include "DocAccessibleChild.h" #include "LocalAccessible-inl.h" -#include "nsEventShell.h" #include "TextLeafAccessible.h" #include "TextUpdater.h" - -#include "nsIContentInlines.h" - #include "mozilla/AppShutdown.h" -#include "mozilla/dom/BrowserChild.h" -#include "mozilla/dom/Element.h" #include "mozilla/PerfStats.h" #include "mozilla/PresShell.h" #include "mozilla/ProfilerMarkers.h" -#include "nsAccessibilityService.h" +#include "mozilla/dom/BrowserChild.h" +#include "mozilla/dom/Element.h" #include "mozilla/glean/AccessibleMetrics.h" +#include "nsAccessibilityService.h" +#include "nsEventShell.h" +#include "nsIContentInlines.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/NotificationController.h b/accessible/base/NotificationController.h index dd8b6d5e89fd..7c11d98edd9f 100644 --- a/accessible/base/NotificationController.h +++ b/accessible/base/NotificationController.h @@ -5,16 +5,15 @@ #ifndef mozilla_a11y_NotificationController_h_ #define mozilla_a11y_NotificationController_h_ -#include "EventQueue.h" +#include +#include "EventQueue.h" #include "nsClassHashtable.h" #include "nsCycleCollectionParticipant.h" #include "nsIFrame.h" #include "nsRefreshObservers.h" #include "nsTHashSet.h" -#include - #ifdef A11Y_LOG # include "Logging.h" #endif diff --git a/accessible/base/Pivot.cpp b/accessible/base/Pivot.cpp index 7614035e0395..b6efdcf2126d 100644 --- a/accessible/base/Pivot.cpp +++ b/accessible/base/Pivot.cpp @@ -7,11 +7,10 @@ #include "AccIterator.h" #include "LocalAccessible.h" #include "RemoteAccessible.h" +#include "mozilla/a11y/Accessible.h" #include "nsAccUtils.h" #include "nsIAccessiblePivot.h" -#include "mozilla/a11y/Accessible.h" - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/Pivot.h b/accessible/base/Pivot.h index d8a4dfdbb59f..2ae5fe1020f0 100644 --- a/accessible/base/Pivot.h +++ b/accessible/base/Pivot.h @@ -6,6 +6,7 @@ #define mozilla_a11y_Pivot_h_ #include + #include "mozilla/a11y/Role.h" #include "mozilla/dom/ChildIterator.h" diff --git a/accessible/base/Platform.h b/accessible/base/Platform.h index 014d1c8c369a..bc23bbb60fe9 100644 --- a/accessible/base/Platform.h +++ b/accessible/base/Platform.h @@ -6,8 +6,9 @@ #define mozilla_a11y_Platform_h #include -#include "nsStringFwd.h" + #include "Units.h" +#include "nsStringFwd.h" #if defined(ANDROID) # include "nsTArray.h" diff --git a/accessible/base/Relation.h b/accessible/base/Relation.h index 6f816c3b1aad..b692ee848eb8 100644 --- a/accessible/base/Relation.h +++ b/accessible/base/Relation.h @@ -5,10 +5,10 @@ #ifndef mozilla_a11y_relation_h_ #define mozilla_a11y_relation_h_ -#include "AccIterator.h" - #include +#include "AccIterator.h" + namespace mozilla { namespace a11y { diff --git a/accessible/base/SelectionManager.cpp b/accessible/base/SelectionManager.cpp index ec0face044ef..b33fa133c75a 100644 --- a/accessible/base/SelectionManager.cpp +++ b/accessible/base/SelectionManager.cpp @@ -5,19 +5,18 @@ #include "mozilla/a11y/SelectionManager.h" #include "DocAccessible-inl.h" -#include "HyperTextAccessible.h" #include "HyperTextAccessible-inl.h" -#include "nsAccessibilityService.h" +#include "HyperTextAccessible.h" +#include "TextLeafRange.h" +#include "mozilla/PresShell.h" +#include "mozilla/a11y/DocAccessibleChild.h" +#include "mozilla/dom/Element.h" +#include "mozilla/dom/Selection.h" #include "nsAccUtils.h" +#include "nsAccessibilityService.h" #include "nsCoreUtils.h" #include "nsEventShell.h" #include "nsFrameSelection.h" -#include "TextLeafRange.h" - -#include "mozilla/a11y/DocAccessibleChild.h" -#include "mozilla/PresShell.h" -#include "mozilla/dom/Selection.h" -#include "mozilla/dom/Element.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/SelectionManager.h b/accessible/base/SelectionManager.h index 690abad54034..18b8959ec44c 100644 --- a/accessible/base/SelectionManager.h +++ b/accessible/base/SelectionManager.h @@ -5,9 +5,9 @@ #ifndef mozilla_a11y_SelectionManager_h_ #define mozilla_a11y_SelectionManager_h_ +#include "mozilla/WeakPtr.h" #include "nsISelectionController.h" #include "nsISelectionListener.h" -#include "mozilla/WeakPtr.h" namespace mozilla { diff --git a/accessible/base/StyleInfo.h b/accessible/base/StyleInfo.h index c21ae669646f..b617116c62ee 100644 --- a/accessible/base/StyleInfo.h +++ b/accessible/base/StyleInfo.h @@ -5,10 +5,10 @@ #ifndef _mozilla_a11y_style_h_ #define _mozilla_a11y_style_h_ -#include "mozilla/gfx/Types.h" #include "mozilla/AlreadyAddRefed.h" -#include "nsStringFwd.h" +#include "mozilla/gfx/Types.h" #include "nsColor.h" +#include "nsStringFwd.h" class nsAtom; diff --git a/accessible/base/TextAttrs.cpp b/accessible/base/TextAttrs.cpp index d2ce06bef67e..98146b854e2e 100644 --- a/accessible/base/TextAttrs.cpp +++ b/accessible/base/TextAttrs.cpp @@ -5,16 +5,15 @@ #include "TextAttrs.h" #include "AccAttributes.h" -#include "nsAccUtils.h" -#include "nsCoreUtils.h" +#include "HyperTextAccessible.h" #include "StyleInfo.h" - #include "gfxTextRun.h" +#include "mozilla/AppUnits.h" +#include "nsAccUtils.h" +#include "nsContainerFrame.h" +#include "nsCoreUtils.h" #include "nsFontMetrics.h" #include "nsLayoutUtils.h" -#include "nsContainerFrame.h" -#include "HyperTextAccessible.h" -#include "mozilla/AppUnits.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/TextLeafRange.cpp b/accessible/base/TextLeafRange.cpp index 41dd29545caa..6f91d3147964 100644 --- a/accessible/base/TextLeafRange.cpp +++ b/accessible/base/TextLeafRange.cpp @@ -5,21 +5,24 @@ #include "TextLeafRange.h" #include "HyperTextAccessible-inl.h" +#include "Pivot.h" +#include "TextAttrs.h" +#include "TextRange.h" +#include "mozilla/BinarySearch.h" +#include "mozilla/Casting.h" +#include "mozilla/PresShell.h" +#include "mozilla/StaticPrefs_layout.h" +#include "mozilla/TextEditor.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/CacheConstants.h" #include "mozilla/a11y/DocAccessible.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/LocalAccessible.h" -#include "mozilla/BinarySearch.h" -#include "mozilla/Casting.h" #include "mozilla/dom/AbstractRange.h" #include "mozilla/dom/CharacterData.h" #include "mozilla/dom/HTMLInputElement.h" -#include "mozilla/PresShell.h" #include "mozilla/intl/Segmenter.h" #include "mozilla/intl/WordBreaker.h" -#include "mozilla/StaticPrefs_layout.h" -#include "mozilla/TextEditor.h" #include "nsAccUtils.h" #include "nsBlockFrame.h" #include "nsFocusManager.h" @@ -31,9 +34,6 @@ #include "nsTArray.h" #include "nsTextFrame.h" #include "nsUnicharUtils.h" -#include "Pivot.h" -#include "TextAttrs.h" -#include "TextRange.h" using mozilla::intl::WordBreaker; using FindWordOptions = mozilla::intl::WordBreaker::FindWordOptions; diff --git a/accessible/base/TextLeafRange.h b/accessible/base/TextLeafRange.h index 06cd8b0047e8..2c1b5161e61a 100644 --- a/accessible/base/TextLeafRange.h +++ b/accessible/base/TextLeafRange.h @@ -8,9 +8,9 @@ #include #include "AccAttributes.h" +#include "mozilla/FunctionRef.h" #include "nsDirection.h" #include "nsIAccessibleText.h" -#include "mozilla/FunctionRef.h" namespace mozilla { namespace dom { diff --git a/accessible/base/TextRange.cpp b/accessible/base/TextRange.cpp index 031428315092..e0d6e9e0640e 100644 --- a/accessible/base/TextRange.cpp +++ b/accessible/base/TextRange.cpp @@ -2,10 +2,9 @@ * 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 "TextRange-inl.h" - -#include "LocalAccessible-inl.h" #include "HyperTextAccessible-inl.h" +#include "LocalAccessible-inl.h" +#include "TextRange-inl.h" #include "mozilla/IntegerRange.h" #include "mozilla/dom/Selection.h" #include "nsAccUtils.h" diff --git a/accessible/base/TextUpdater.cpp b/accessible/base/TextUpdater.cpp index b0b87fb76e1b..162de85fa062 100644 --- a/accessible/base/TextUpdater.cpp +++ b/accessible/base/TextUpdater.cpp @@ -4,10 +4,11 @@ #include "TextUpdater.h" +#include + #include "CacheConstants.h" #include "DocAccessible-inl.h" #include "TextLeafAccessible.h" -#include using namespace mozilla::a11y; diff --git a/accessible/base/TreeWalker.cpp b/accessible/base/TreeWalker.cpp index 78af10284e40..2270075375f7 100644 --- a/accessible/base/TreeWalker.cpp +++ b/accessible/base/TreeWalker.cpp @@ -5,12 +5,11 @@ #include "TreeWalker.h" #include "ARIAMap.h" -#include "nsAccessibilityService.h" #include "DocAccessible.h" - -#include "nsIContentInlines.h" #include "mozilla/dom/ChildIterator.h" #include "mozilla/dom/Element.h" +#include "nsAccessibilityService.h" +#include "nsIContentInlines.h" namespace mozilla::a11y { diff --git a/accessible/base/TreeWalker.h b/accessible/base/TreeWalker.h index 4584a7c33652..973dcba3e5c7 100644 --- a/accessible/base/TreeWalker.h +++ b/accessible/base/TreeWalker.h @@ -6,6 +6,7 @@ #define mozilla_a11y_TreeWalker_h_ #include + #include "mozilla/dom/ChildIterator.h" #include "nsCOMPtr.h" diff --git a/accessible/base/nsAccUtils.cpp b/accessible/base/nsAccUtils.cpp index 150b959fa01a..cbec79b9d542 100644 --- a/accessible/base/nsAccUtils.cpp +++ b/accessible/base/nsAccUtils.cpp @@ -4,26 +4,25 @@ #include "nsAccUtils.h" -#include "AccAttributes.h" #include "ARIAMap.h" -#include "nsCoreUtils.h" -#include "nsGenericHTMLElement.h" +#include "AccAttributes.h" #include "DocAccessible.h" #include "DocAccessibleParent.h" #include "HyperTextAccessible.h" -#include "nsIAccessibleTypes.h" -#include "mozilla/a11y/Role.h" #include "States.h" #include "TextLeafAccessible.h" - -#include "nsIBaseWindow.h" -#include "nsIDocShellTreeOwner.h" -#include "nsIDOMXULContainerElement.h" #include "mozilla/a11y/RemoteAccessible.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/ElementInternals.h" #include "nsAccessibilityService.h" +#include "nsCoreUtils.h" +#include "nsGenericHTMLElement.h" +#include "nsIAccessibleTypes.h" +#include "nsIBaseWindow.h" +#include "nsIDOMXULContainerElement.h" +#include "nsIDocShellTreeOwner.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/nsAccUtils.h b/accessible/base/nsAccUtils.h index 96d8056e5a23..d0de9c589de7 100644 --- a/accessible/base/nsAccUtils.h +++ b/accessible/base/nsAccUtils.h @@ -5,12 +5,10 @@ #ifndef nsAccUtils_h_ #define nsAccUtils_h_ -#include "mozilla/a11y/LocalAccessible.h" #include "mozilla/a11y/DocManager.h" - +#include "mozilla/a11y/LocalAccessible.h" #include "nsAccessibilityService.h" #include "nsCoreUtils.h" - #include "nsIDocShell.h" #include "nsPoint.h" diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index 41b95a598d9f..45230d0f539c 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -5,14 +5,13 @@ #include "nsAccessibilityService.h" // NOTE: alphabetically ordered -#include "ApplicationAccessibleWrap.h" #include "ARIAGridAccessible.h" #include "ARIAMap.h" +#include "ApplicationAccessibleWrap.h" #include "CssAltContent.h" #include "DocAccessible-inl.h" #include "DocAccessibleChild.h" #include "FocusManager.h" -#include "mozilla/FocusModel.h" #include "HTMLCanvasAccessible.h" #include "HTMLElementAccessibles.h" #include "HTMLImageMapAccessible.h" @@ -21,21 +20,22 @@ #include "HTMLSelectAccessible.h" #include "HTMLTableAccessible.h" #include "HyperTextAccessible.h" +#include "OuterDocAccessible.h" +#include "Pivot.h" #include "RootAccessible.h" +#include "mozilla/FocusModel.h" +#include "mozilla/a11y/Role.h" #include "nsAccUtils.h" #include "nsArrayUtils.h" #include "nsAttrName.h" -#include "nsDOMTokenList.h" #include "nsCRT.h" +#include "nsDOMTokenList.h" #include "nsEventShell.h" #include "nsGkAtoms.h" #include "nsIAccessibleAnnouncementEvent.h" #include "nsIFrameInlines.h" #include "nsServiceManagerUtils.h" #include "nsTextFormatter.h" -#include "OuterDocAccessible.h" -#include "Pivot.h" -#include "mozilla/a11y/Role.h" #ifdef MOZ_ACCESSIBILITY_ATK # include "RootAccessibleWrap.h" #endif @@ -44,33 +44,14 @@ #include "xpcAccessibleApplication.h" #ifdef XP_WIN -# include "mozilla/a11y/Compatibility.h" # include "mozilla/StaticPtr.h" +# include "mozilla/a11y/Compatibility.h" #endif #ifdef A11Y_LOG # include "Logging.h" #endif -#include "nsExceptionHandler.h" -#include "nsImageFrame.h" -#include "nsIObserverService.h" -#include "nsMenuPopupFrame.h" -#include "nsLayoutUtils.h" -#include "nsTreeBodyFrame.h" -#include "nsTreeUtils.h" -#include "mozilla/a11y/AccTypes.h" -#include "mozilla/dom/ARIANotifyMixinBinding.h" -#include "mozilla/dom/ContentParent.h" -#include "mozilla/dom/DOMStringList.h" -#include "mozilla/dom/EventTarget.h" -#include "mozilla/dom/HTMLTableElement.h" -#include "mozilla/Preferences.h" -#include "mozilla/PresShell.h" -#include "mozilla/ProfilerMarkers.h" -#include "mozilla/RefPtr.h" -#include "mozilla/Services.h" - #include "XULAlertAccessible.h" #include "XULComboboxAccessible.h" #include "XULElementAccessibles.h" @@ -79,6 +60,24 @@ #include "XULMenuAccessible.h" #include "XULTabAccessible.h" #include "XULTreeGridAccessible.h" +#include "mozilla/Preferences.h" +#include "mozilla/PresShell.h" +#include "mozilla/ProfilerMarkers.h" +#include "mozilla/RefPtr.h" +#include "mozilla/Services.h" +#include "mozilla/a11y/AccTypes.h" +#include "mozilla/dom/ARIANotifyMixinBinding.h" +#include "mozilla/dom/ContentParent.h" +#include "mozilla/dom/DOMStringList.h" +#include "mozilla/dom/EventTarget.h" +#include "mozilla/dom/HTMLTableElement.h" +#include "nsExceptionHandler.h" +#include "nsIObserverService.h" +#include "nsImageFrame.h" +#include "nsLayoutUtils.h" +#include "nsMenuPopupFrame.h" +#include "nsTreeBodyFrame.h" +#include "nsTreeUtils.h" using namespace mozilla; using namespace mozilla::a11y; @@ -1667,8 +1666,8 @@ LocalAccessible* nsAccessibilityService::CreateAccessible( } #if defined(ANDROID) -# include "mozilla/Monitor.h" # include "mozilla/Maybe.h" +# include "mozilla/Monitor.h" constinit static Maybe sAndroidMonitor; diff --git a/accessible/base/nsAccessibilityService.h b/accessible/base/nsAccessibilityService.h index ca4f1448a947..53619a47125d 100644 --- a/accessible/base/nsAccessibilityService.h +++ b/accessible/base/nsAccessibilityService.h @@ -5,20 +5,19 @@ #ifndef _nsAccessibilityService_h_ #define _nsAccessibilityService_h_ +#include "mozilla/Preferences.h" +#include "mozilla/StaticPtr.h" #include "mozilla/a11y/CacheConstants.h" #include "mozilla/a11y/DocManager.h" #include "mozilla/a11y/FocusManager.h" #include "mozilla/a11y/Platform.h" #include "mozilla/a11y/Role.h" #include "mozilla/a11y/SelectionManager.h" -#include "mozilla/Preferences.h" -#include "mozilla/StaticPtr.h" - #include "nsAtomHashKeys.h" -#include "nsIContent.h" -#include "nsIObserver.h" #include "nsIAccessibleEvent.h" +#include "nsIContent.h" #include "nsIEventListenerService.h" +#include "nsIObserver.h" #include "nsXULAppAPI.h" #include "xpcAccessibilityService.h" diff --git a/accessible/base/nsCoreUtils.cpp b/accessible/base/nsCoreUtils.cpp index fe4d2965ccba..acf72bf828dc 100644 --- a/accessible/base/nsCoreUtils.cpp +++ b/accessible/base/nsCoreUtils.cpp @@ -4,19 +4,8 @@ #include "nsCoreUtils.h" -#include "nsAttrValue.h" -#include "nsIAccessibleTypes.h" - -#include "mozilla/dom/Document.h" -#include "nsAccUtils.h" -#include "nsRange.h" -#include "nsXULElement.h" -#include "nsIDocShell.h" -#include "nsIObserverService.h" -#include "nsPresContext.h" -#include "nsISelectionController.h" -#include "nsISimpleEnumerator.h" -#include "mozilla/dom/TouchEvent.h" +#include "AnchorPositioningUtils.h" +#include "XULTreeElement.h" #include "mozilla/ErrorResult.h" #include "mozilla/EventListenerManager.h" #include "mozilla/EventStateManager.h" @@ -24,24 +13,32 @@ #include "mozilla/PresShell.h" #include "mozilla/ScrollContainerFrame.h" #include "mozilla/TouchEvents.h" -#include "nsGkAtoms.h" - -#include "AnchorPositioningUtils.h" -#include "nsComponentManagerUtils.h" - -#include "XULTreeElement.h" -#include "nsIContentInlines.h" -#include "nsTreeColumns.h" +#include "mozilla/dom/AncestorIterator.h" +#include "mozilla/dom/Document.h" #include "mozilla/dom/DocumentInlines.h" #include "mozilla/dom/Element.h" +#include "mozilla/dom/ElementInternals.h" +#include "mozilla/dom/HTMLLabelElement.h" #include "mozilla/dom/HTMLOptGroupElement.h" #include "mozilla/dom/HTMLOptionElement.h" #include "mozilla/dom/HTMLSelectElement.h" -#include "mozilla/dom/AncestorIterator.h" -#include "mozilla/dom/ElementInternals.h" -#include "mozilla/dom/HTMLLabelElement.h" #include "mozilla/dom/MouseEventBinding.h" #include "mozilla/dom/Selection.h" +#include "mozilla/dom/TouchEvent.h" +#include "nsAccUtils.h" +#include "nsAttrValue.h" +#include "nsComponentManagerUtils.h" +#include "nsGkAtoms.h" +#include "nsIAccessibleTypes.h" +#include "nsIContentInlines.h" +#include "nsIDocShell.h" +#include "nsIObserverService.h" +#include "nsISelectionController.h" +#include "nsISimpleEnumerator.h" +#include "nsPresContext.h" +#include "nsRange.h" +#include "nsTreeColumns.h" +#include "nsXULElement.h" using namespace mozilla; diff --git a/accessible/base/nsCoreUtils.h b/accessible/base/nsCoreUtils.h index 6ad3cd6c4408..92b52a7348a1 100644 --- a/accessible/base/nsCoreUtils.h +++ b/accessible/base/nsCoreUtils.h @@ -6,16 +6,15 @@ #define nsCoreUtils_h_ #include "AttrArray.h" +#include "Units.h" #include "mozilla/EventForwards.h" +#include "mozilla/FlushType.h" +#include "mozilla/PresShellForwards.h" #include "nsCaseTreatment.h" #include "nsIAccessibleEvent.h" #include "nsIContent.h" -#include "mozilla/FlushType.h" -#include "mozilla/PresShellForwards.h" - #include "nsPoint.h" #include "nsTArray.h" -#include "Units.h" class nsAttrValue; class nsGenericHTMLElement; diff --git a/accessible/base/nsEventShell.cpp b/accessible/base/nsEventShell.cpp index b4cf8ce965da..d701c3dc0c7e 100644 --- a/accessible/base/nsEventShell.cpp +++ b/accessible/base/nsEventShell.cpp @@ -4,10 +4,9 @@ #include "nsEventShell.h" -#include "nsAccessibilityService.h" #include "Logging.h" - #include "mozilla/dom/DOMStringList.h" +#include "nsAccessibilityService.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/nsTextEquivUtils.cpp b/accessible/base/nsTextEquivUtils.cpp index 889046d331b1..9bc48a29fd08 100644 --- a/accessible/base/nsTextEquivUtils.cpp +++ b/accessible/base/nsTextEquivUtils.cpp @@ -4,13 +4,13 @@ #include "nsTextEquivUtils.h" -#include "LocalAccessible-inl.h" #include "AccIterator.h" #include "CssAltContent.h" -#include "nsCoreUtils.h" +#include "LocalAccessible-inl.h" #include "Relation.h" #include "mozilla/dom/ChildIterator.h" #include "mozilla/dom/Text.h" +#include "nsCoreUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/basetypes/Accessible.cpp b/accessible/basetypes/Accessible.cpp index a4168b07381c..db521c839780 100644 --- a/accessible/basetypes/Accessible.cpp +++ b/accessible/basetypes/Accessible.cpp @@ -3,18 +3,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Accessible.h" + #include "ARIAMap.h" -#include "nsAccUtils.h" -#include "nsIURI.h" #include "Pivot.h" #include "Relation.h" #include "States.h" -#include "mozilla/a11y/FocusManager.h" -#include "mozilla/a11y/HyperTextAccessibleBase.h" #include "mozilla/BasicEvents.h" #include "mozilla/Components.h" #include "mozilla/ProfilerMarkers.h" +#include "mozilla/a11y/FocusManager.h" +#include "mozilla/a11y/HyperTextAccessibleBase.h" +#include "nsAccUtils.h" #include "nsIStringBundle.h" +#include "nsIURI.h" #ifdef A11Y_LOG # include "nsAccessibilityService.h" diff --git a/accessible/basetypes/Accessible.h b/accessible/basetypes/Accessible.h index 1268c36f525d..d0a41e73e0fa 100644 --- a/accessible/basetypes/Accessible.h +++ b/accessible/basetypes/Accessible.h @@ -5,11 +5,11 @@ #ifndef Accessible_H_ #define Accessible_H_ -#include "mozilla/a11y/Role.h" -#include "mozilla/a11y/AccTypes.h" -#include "nsStringFwd.h" -#include "nsRect.h" #include "Units.h" +#include "mozilla/a11y/AccTypes.h" +#include "mozilla/a11y/Role.h" +#include "nsRect.h" +#include "nsStringFwd.h" class nsAtom; class nsStaticAtom; diff --git a/accessible/basetypes/HyperTextAccessibleBase.cpp b/accessible/basetypes/HyperTextAccessibleBase.cpp index 861fbf441cd6..022f9942b095 100644 --- a/accessible/basetypes/HyperTextAccessibleBase.cpp +++ b/accessible/basetypes/HyperTextAccessibleBase.cpp @@ -4,10 +4,10 @@ #include "HyperTextAccessibleBase.h" -#include "mozilla/a11y/Accessible.h" -#include "nsAccUtils.h" #include "TextLeafRange.h" #include "TextRange.h" +#include "mozilla/a11y/Accessible.h" +#include "nsAccUtils.h" namespace mozilla::a11y { diff --git a/accessible/basetypes/TableCellAccessible.h b/accessible/basetypes/TableCellAccessible.h index fe4049b86a81..9736ff36da29 100644 --- a/accessible/basetypes/TableCellAccessible.h +++ b/accessible/basetypes/TableCellAccessible.h @@ -5,9 +5,10 @@ #ifndef mozilla_a11y_TableCellAccessible_h_ #define mozilla_a11y_TableCellAccessible_h_ -#include "nsTArray.h" #include +#include "nsTArray.h" + namespace mozilla { namespace a11y { diff --git a/accessible/generic/ARIAGridAccessible.cpp b/accessible/generic/ARIAGridAccessible.cpp index be05dc99804b..01ca00e21bb9 100644 --- a/accessible/generic/ARIAGridAccessible.cpp +++ b/accessible/generic/ARIAGridAccessible.cpp @@ -5,15 +5,16 @@ #include "ARIAGridAccessible.h" #include -#include "LocalAccessible-inl.h" + #include "AccAttributes.h" +#include "LocalAccessible-inl.h" +#include "States.h" +#include "mozilla/a11y/Role.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "nsAccessibilityService.h" #include "nsAccUtils.h" +#include "nsAccessibilityService.h" #include "nsGkAtoms.h" -#include "mozilla/a11y/Role.h" -#include "States.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/generic/ApplicationAccessible.cpp b/accessible/generic/ApplicationAccessible.cpp index 109061aa2164..13adeebb2e34 100644 --- a/accessible/generic/ApplicationAccessible.cpp +++ b/accessible/generic/ApplicationAccessible.cpp @@ -5,17 +5,16 @@ #include "ApplicationAccessible.h" #include "LocalAccessible-inl.h" -#include "nsAccessibilityService.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" - -#include "nsServiceManagerUtils.h" -#include "mozilla/dom/Document.h" #include "mozilla/Components.h" +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/Document.h" +#include "nsAccessibilityService.h" #include "nsGlobalWindowOuter.h" #include "nsIStringBundle.h" #include "nsPIDOMWindowInlines.h" +#include "nsServiceManagerUtils.h" using namespace mozilla::a11y; diff --git a/accessible/generic/ApplicationAccessible.h b/accessible/generic/ApplicationAccessible.h index b229e1fa89e7..c39978d67657 100644 --- a/accessible/generic/ApplicationAccessible.h +++ b/accessible/generic/ApplicationAccessible.h @@ -6,7 +6,6 @@ #define mozilla_a11y_ApplicationAccessible_h_ #include "AccessibleWrap.h" - #include "nsIXULAppInfo.h" namespace mozilla { diff --git a/accessible/generic/DocAccessible-inl.h b/accessible/generic/DocAccessible-inl.h index 74e6aa08af14..7ad8b32eb5a0 100644 --- a/accessible/generic/DocAccessible-inl.h +++ b/accessible/generic/DocAccessible-inl.h @@ -7,10 +7,10 @@ #include "DocAccessible.h" #include "LocalAccessible-inl.h" -#include "nsAccessibilityService.h" #include "NotificationController.h" #include "States.h" #include "mozilla/dom/DocumentInlines.h" +#include "nsAccessibilityService.h" #ifdef A11Y_LOG # include "Logging.h" diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp index dbe87d7d3ecb..c181d9b2e610 100644 --- a/accessible/generic/DocAccessible.cpp +++ b/accessible/generic/DocAccessible.cpp @@ -2,39 +2,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/. */ -#include "LocalAccessible-inl.h" -#include "AccIterator.h" -#include "AccAttributes.h" #include "ARIAMap.h" +#include "AccAttributes.h" +#include "AccIterator.h" +#include "AnchorPositioningUtils.h" #include "CachedTableAccessible.h" #include "DocAccessible-inl.h" #include "EventTree.h" #include "HTMLImageMapAccessible.h" +#include "LocalAccessible-inl.h" #include "Relation.h" -#include "mozilla/ProfilerMarkers.h" -#include "nsAccUtils.h" -#include "nsEventShell.h" -#include "nsIIOService.h" -#include "nsLayoutUtils.h" -#include "nsTextEquivUtils.h" -#include "mozilla/a11y/Role.h" #include "TreeWalker.h" -#include "xpcAccessibleDocument.h" - -#include "AnchorPositioningUtils.h" -#include "nsIDocShell.h" -#include "mozilla/dom/BrowsingContext.h" -#include "mozilla/dom/Document.h" -#include "nsPIDOMWindow.h" -#include "nsIContentInlines.h" -#include "nsIEditingSession.h" -#include "nsIFrame.h" -#include "nsIInterfaceRequestorUtils.h" -#include "nsImageFrame.h" -#include "nsIMutationObserver.h" -#include "nsIURI.h" -#include "nsIWebNavigation.h" -#include "nsFocusManager.h" #include "mozilla/AppShutdown.h" #include "mozilla/Assertions.h" #include "mozilla/Components.h" // for mozilla::components @@ -42,16 +20,37 @@ #include "mozilla/HTMLEditor.h" #include "mozilla/PerfStats.h" #include "mozilla/PresShell.h" +#include "mozilla/ProfilerMarkers.h" #include "mozilla/ScrollContainerFrame.h" -#include "nsAccessibilityService.h" #include "mozilla/a11y/DocAccessibleChild.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/AncestorIterator.h" #include "mozilla/dom/BrowserChild.h" +#include "mozilla/dom/BrowsingContext.h" +#include "mozilla/dom/Document.h" #include "mozilla/dom/DocumentType.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/ElementInlines.h" #include "mozilla/dom/HTMLSelectElement.h" #include "mozilla/dom/UserActivation.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsEventShell.h" +#include "nsFocusManager.h" +#include "nsIContentInlines.h" +#include "nsIDocShell.h" +#include "nsIEditingSession.h" +#include "nsIFrame.h" +#include "nsIIOService.h" +#include "nsIInterfaceRequestorUtils.h" +#include "nsIMutationObserver.h" +#include "nsIURI.h" +#include "nsIWebNavigation.h" +#include "nsImageFrame.h" +#include "nsLayoutUtils.h" +#include "nsPIDOMWindow.h" +#include "nsTextEquivUtils.h" +#include "xpcAccessibleDocument.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/generic/DocAccessible.h b/accessible/generic/DocAccessible.h index 5ed3d4ebd7b8..6917e775149c 100644 --- a/accessible/generic/DocAccessible.h +++ b/accessible/generic/DocAccessible.h @@ -5,15 +5,14 @@ #ifndef mozilla_a11y_DocAccessible_h_ #define mozilla_a11y_DocAccessible_h_ -#include "HyperTextAccessible.h" #include "AccEvent.h" -#include "nsAccessibilityService.h" - -#include "nsClassHashtable.h" -#include "nsTHashMap.h" +#include "HyperTextAccessible.h" #include "mozilla/UniquePtr.h" +#include "nsAccessibilityService.h" +#include "nsClassHashtable.h" #include "nsIDocumentObserver.h" #include "nsITimer.h" +#include "nsTHashMap.h" #include "nsTHashSet.h" #include "nsWeakReference.h" diff --git a/accessible/generic/FormControlAccessible.cpp b/accessible/generic/FormControlAccessible.cpp index baeb0521d381..ab3b94e3d86f 100644 --- a/accessible/generic/FormControlAccessible.cpp +++ b/accessible/generic/FormControlAccessible.cpp @@ -6,8 +6,8 @@ #include "FormControlAccessible.h" -#include "mozilla/dom/HTMLInputElement.h" #include "mozilla/a11y/Role.h" +#include "mozilla/dom/HTMLInputElement.h" using namespace mozilla::a11y; diff --git a/accessible/generic/HyperTextAccessible-inl.h b/accessible/generic/HyperTextAccessible-inl.h index 1dbadc4f61f0..3cebb4b3a840 100644 --- a/accessible/generic/HyperTextAccessible-inl.h +++ b/accessible/generic/HyperTextAccessible-inl.h @@ -6,14 +6,11 @@ #define mozilla_a11y_HyperTextAccessible_inl_h_ #include "HyperTextAccessible.h" - -#include "nsAccUtils.h" - -#include "nsIClipboard.h" -#include "nsFrameSelection.h" - #include "mozilla/CaretAssociationHint.h" #include "mozilla/EditorBase.h" +#include "nsAccUtils.h" +#include "nsFrameSelection.h" +#include "nsIClipboard.h" namespace mozilla::a11y { diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp index 42bc1ee8850e..bd191dd99e6f 100644 --- a/accessible/generic/HyperTextAccessible.cpp +++ b/accessible/generic/HyperTextAccessible.cpp @@ -2,42 +2,40 @@ * 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 "HyperTextAccessible-inl.h" - -#include "nsAccessibilityService.h" -#include "nsIAccessibleTypes.h" #include "AccAttributes.h" #include "HTMLListAccessible.h" +#include "HyperTextAccessible-inl.h" #include "LocalAccessible-inl.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" #include "TextAttrs.h" #include "TextLeafRange.h" #include "TextRange.h" #include "TreeWalker.h" - -#include "nsCaret.h" -#include "nsContentUtils.h" -#include "nsDebug.h" -#include "nsFocusManager.h" -#include "nsIEditingSession.h" -#include "nsContainerFrame.h" -#include "nsFrameSelection.h" -#include "nsILineIterator.h" -#include "nsIMathMLFrame.h" -#include "nsLayoutUtils.h" -#include "nsRange.h" +#include "gfxSkipChars.h" #include "mozilla/Assertions.h" #include "mozilla/EditorBase.h" #include "mozilla/HTMLEditor.h" #include "mozilla/PresShell.h" #include "mozilla/ScrollContainerFrame.h" #include "mozilla/SelectionMovementUtils.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/HTMLBRElement.h" #include "mozilla/dom/Selection.h" -#include "gfxSkipChars.h" +#include "nsAccessibilityService.h" +#include "nsCaret.h" +#include "nsContainerFrame.h" +#include "nsContentUtils.h" +#include "nsDebug.h" +#include "nsFocusManager.h" +#include "nsFrameSelection.h" +#include "nsIAccessibleTypes.h" +#include "nsIEditingSession.h" +#include "nsILineIterator.h" +#include "nsIMathMLFrame.h" +#include "nsLayoutUtils.h" +#include "nsRange.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/generic/ImageAccessible.cpp b/accessible/generic/ImageAccessible.cpp index cc6496cf5ee7..218da4202ebc 100644 --- a/accessible/generic/ImageAccessible.cpp +++ b/accessible/generic/ImageAccessible.cpp @@ -4,23 +4,22 @@ #include "ImageAccessible.h" -#include "DocAccessible-inl.h" -#include "LocalAccessible-inl.h" -#include "nsAccUtils.h" -#include "mozilla/a11y/Role.h" #include "AccAttributes.h" #include "AccIterator.h" #include "CacheConstants.h" +#include "DocAccessible-inl.h" +#include "LocalAccessible-inl.h" #include "States.h" - #include "imgIRequest.h" -#include "nsGenericHTMLElement.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/Document.h" +#include "nsAccUtils.h" #include "nsContentUtils.h" +#include "nsGenericHTMLElement.h" #include "nsIImageLoadingContent.h" -#include "nsPIDOMWindow.h" #include "nsIURI.h" +#include "nsPIDOMWindow.h" namespace mozilla::a11y { diff --git a/accessible/generic/LocalAccessible-inl.h b/accessible/generic/LocalAccessible-inl.h index 74c811ddcb37..4f7b2b5e63f4 100644 --- a/accessible/generic/LocalAccessible-inl.h +++ b/accessible/generic/LocalAccessible-inl.h @@ -5,11 +5,11 @@ #ifndef mozilla_a11y_Accessible_inl_h_ #define mozilla_a11y_Accessible_inl_h_ -#include "DocAccessible.h" #include "ARIAMap.h" -#include "nsCoreUtils.h" -#include "mozilla/dom/Element.h" +#include "DocAccessible.h" #include "mozilla/PresShell.h" +#include "mozilla/dom/Element.h" +#include "nsCoreUtils.h" #ifdef A11Y_LOG # include "Logging.h" diff --git a/accessible/generic/LocalAccessible.cpp b/accessible/generic/LocalAccessible.cpp index d050a449e599..aa6dcdba75c9 100644 --- a/accessible/generic/LocalAccessible.cpp +++ b/accessible/generic/LocalAccessible.cpp @@ -3,77 +3,33 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccEvent.h" -#include "LocalAccessible-inl.h" - -#include "EmbeddedObjCollector.h" #include "AccGroupInfo.h" #include "AccIterator.h" +#include "ApplicationAccessible.h" #include "CachedTableAccessible.h" #include "CssAltContent.h" #include "DocAccessible-inl.h" -#include "mozilla/a11y/AccAttributes.h" -#include "mozilla/a11y/DocAccessibleChild.h" -#include "mozilla/a11y/Platform.h" -#include "mozilla/FocusModel.h" -#include "nsAccUtils.h" -#include "nsMenuPopupFrame.h" -#include "nsAccessibilityService.h" -#include "ApplicationAccessible.h" -#include "mozilla/dom/ContentList.h" -#include "nsGenericHTMLElement.h" -#include "NotificationController.h" -#include "nsEventShell.h" -#include "nsTextEquivUtils.h" +#include "EmbeddedObjCollector.h" #include "EventTree.h" +#include "HTMLElementAccessibles.h" +#include "HTMLSelectAccessible.h" +#include "HTMLTableAccessible.h" +#include "ImageAccessible.h" +#include "LocalAccessible-inl.h" +#include "NotificationController.h" #include "OuterDocAccessible.h" #include "Pivot.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "RootAccessible.h" #include "States.h" #include "TextLeafAccessible.h" #include "TextLeafRange.h" #include "TextRange.h" -#include "HTMLElementAccessibles.h" -#include "HTMLSelectAccessible.h" -#include "HTMLTableAccessible.h" -#include "ImageAccessible.h" - -#include "nsComputedDOMStyle.h" -#include "nsGkAtoms.h" -#include "nsIDOMXULButtonElement.h" -#include "nsIDOMXULSelectCntrlEl.h" -#include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIMutationObserver.h" - -#include "mozilla/dom/Document.h" -#include "mozilla/dom/HTMLAnchorElement.h" -#include "mozilla/dom/HTMLFormElement.h" -#include "mozilla/dom/HTMLHeadingElement.h" -#include "mozilla/dom/HTMLInputElement.h" -#include "mozilla/dom/NodeList.h" -#include "mozilla/dom/PopoverData.h" -#include "mozilla/gfx/Matrix.h" -#include "nsIContent.h" -#include "nsIFormControl.h" - -#include "nsDisplayList.h" -#include "nsLayoutUtils.h" -#include "nsPresContext.h" -#include "nsIFrame.h" -#include "nsTextFrame.h" -#include "nsIDocShellTreeItem.h" -#include "nsStyleStructInlines.h" -#include "nsFocusManager.h" - -#include "nsString.h" -#include "nsAtom.h" -#include "nsContainerFrame.h" - #include "mozilla/Assertions.h" #include "mozilla/BasicEvents.h" #include "mozilla/ErrorResult.h" #include "mozilla/FloatingPoint.h" +#include "mozilla/FocusModel.h" #include "mozilla/PerfStats.h" #include "mozilla/PresShell.h" #include "mozilla/ProfilerMarkers.h" @@ -81,11 +37,49 @@ #include "mozilla/StaticPrefs_accessibility.h" #include "mozilla/StaticPrefs_dom.h" #include "mozilla/StaticPrefs_ui.h" +#include "mozilla/a11y/AccAttributes.h" +#include "mozilla/a11y/DocAccessibleChild.h" +#include "mozilla/a11y/Platform.h" +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/ContentList.h" +#include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" +#include "mozilla/dom/HTMLAnchorElement.h" +#include "mozilla/dom/HTMLFormElement.h" +#include "mozilla/dom/HTMLHeadingElement.h" +#include "mozilla/dom/HTMLInputElement.h" #include "mozilla/dom/HTMLLabelElement.h" #include "mozilla/dom/KeyboardEventBinding.h" +#include "mozilla/dom/NodeList.h" +#include "mozilla/dom/PopoverData.h" #include "mozilla/dom/TreeWalker.h" #include "mozilla/dom/UserActivation.h" +#include "mozilla/gfx/Matrix.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsAtom.h" +#include "nsComputedDOMStyle.h" +#include "nsContainerFrame.h" +#include "nsDisplayList.h" +#include "nsEventShell.h" +#include "nsFocusManager.h" +#include "nsGenericHTMLElement.h" +#include "nsGkAtoms.h" +#include "nsIContent.h" +#include "nsIDOMXULButtonElement.h" +#include "nsIDOMXULSelectCntrlEl.h" +#include "nsIDOMXULSelectCntrlItemEl.h" +#include "nsIDocShellTreeItem.h" +#include "nsIFormControl.h" +#include "nsIFrame.h" +#include "nsIMutationObserver.h" +#include "nsLayoutUtils.h" +#include "nsMenuPopupFrame.h" +#include "nsPresContext.h" +#include "nsString.h" +#include "nsStyleStructInlines.h" +#include "nsTextEquivUtils.h" +#include "nsTextFrame.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/generic/LocalAccessible.h b/accessible/generic/LocalAccessible.h index bb89fd6bb50a..3d36fd614406 100644 --- a/accessible/generic/LocalAccessible.h +++ b/accessible/generic/LocalAccessible.h @@ -6,18 +6,16 @@ #define LocalAccessible_H_ #include "mozilla/ComputedStyle.h" -#include "mozilla/a11y/Accessible.h" +#include "mozilla/UniquePtr.h" #include "mozilla/a11y/AccTypes.h" +#include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/CacheConstants.h" #include "mozilla/a11y/RelationType.h" #include "mozilla/a11y/States.h" - -#include "mozilla/UniquePtr.h" - #include "nsIContent.h" -#include "nsTArray.h" -#include "nsRefPtrHashtable.h" #include "nsRect.h" +#include "nsRefPtrHashtable.h" +#include "nsTArray.h" struct nsRoleMapEntry; diff --git a/accessible/generic/OuterDocAccessible.cpp b/accessible/generic/OuterDocAccessible.cpp index 7a70453fa5b3..586dbba9139e 100644 --- a/accessible/generic/OuterDocAccessible.cpp +++ b/accessible/generic/OuterDocAccessible.cpp @@ -4,13 +4,13 @@ #include "OuterDocAccessible.h" -#include "LocalAccessible-inl.h" #include "DocAccessible-inl.h" +#include "LocalAccessible-inl.h" #include "mozilla/a11y/DocAccessibleChild.h" #include "mozilla/a11y/DocAccessibleParent.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/BrowserBridgeChild.h" #include "mozilla/dom/BrowserParent.h" -#include "mozilla/a11y/Role.h" #ifdef A11Y_LOG # include "Logging.h" diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp index a89ddf83fcf7..c8abc6cc237a 100644 --- a/accessible/generic/RootAccessible.cpp +++ b/accessible/generic/RootAccessible.cpp @@ -8,38 +8,35 @@ #define CreateEvent CreateEventA -#include "LocalAccessible-inl.h" #include "DocAccessible-inl.h" -#include "mozilla/a11y/DocAccessibleParent.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" -#include "nsCoreUtils.h" -#include "nsEventShell.h" +#include "LocalAccessible-inl.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" #include "XULTreeAccessible.h" - +#include "mozilla/a11y/DocAccessibleParent.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/BindingUtils.h" -#include "mozilla/dom/CustomEvent.h" -#include "mozilla/dom/Element.h" -#include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/BrowserHost.h" -#include "mozilla/dom/VisualViewport.h" - -#include "nsIDocShellTreeOwner.h" +#include "mozilla/dom/CustomEvent.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" #include "mozilla/dom/Event.h" #include "mozilla/dom/EventTarget.h" +#include "mozilla/dom/ScriptSettings.h" +#include "mozilla/dom/VisualViewport.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsCoreUtils.h" +#include "nsEventShell.h" +#include "nsFocusManager.h" #include "nsGlobalWindowInner.h" +#include "nsIAppWindow.h" #include "nsIDOMXULMultSelectCntrlEl.h" -#include "mozilla/dom/Document.h" +#include "nsIDocShellTreeOwner.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIPropertyBag2.h" -#include "nsPIDOMWindow.h" #include "nsIWebBrowserChrome.h" -#include "nsFocusManager.h" - -#include "nsIAppWindow.h" +#include "nsPIDOMWindow.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/generic/RootAccessible.h b/accessible/generic/RootAccessible.h index e68ea7d1bbe2..2e976e969a3e 100644 --- a/accessible/generic/RootAccessible.h +++ b/accessible/generic/RootAccessible.h @@ -5,9 +5,8 @@ #ifndef mozilla_a11y_RootAccessible_h_ #define mozilla_a11y_RootAccessible_h_ -#include "HyperTextAccessible.h" #include "DocAccessibleWrap.h" - +#include "HyperTextAccessible.h" #include "nsIDOMEventListener.h" namespace mozilla { diff --git a/accessible/html/HTMLElementAccessibles.cpp b/accessible/html/HTMLElementAccessibles.cpp index ad02df0a7aac..fa30b3c3bfb3 100644 --- a/accessible/html/HTMLElementAccessibles.cpp +++ b/accessible/html/HTMLElementAccessibles.cpp @@ -5,15 +5,14 @@ #include "HTMLElementAccessibles.h" #include "CacheConstants.h" +#include "Relation.h" +#include "States.h" +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/HTMLDetailsElement.h" +#include "mozilla/dom/HTMLLabelElement.h" +#include "mozilla/dom/HTMLSummaryElement.h" #include "nsCoreUtils.h" #include "nsTextEquivUtils.h" -#include "Relation.h" -#include "mozilla/a11y/Role.h" -#include "States.h" - -#include "mozilla/dom/HTMLLabelElement.h" -#include "mozilla/dom/HTMLDetailsElement.h" -#include "mozilla/dom/HTMLSummaryElement.h" using namespace mozilla::a11y; diff --git a/accessible/html/HTMLFormControlAccessible.cpp b/accessible/html/HTMLFormControlAccessible.cpp index 1fea3e108c8a..adbe1d46c22b 100644 --- a/accessible/html/HTMLFormControlAccessible.cpp +++ b/accessible/html/HTMLFormControlAccessible.cpp @@ -7,24 +7,22 @@ #include "CacheConstants.h" #include "DocAccessible-inl.h" #include "LocalAccessible-inl.h" -#include "nsAccUtils.h" -#include "nsEventShell.h" -#include "nsTextEquivUtils.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" #include "TextLeafAccessible.h" - -#include "mozilla/dom/ContentList.h" -#include "mozilla/dom/HTMLInputElement.h" -#include "mozilla/dom/HTMLMeterElement.h" -#include "mozilla/dom/HTMLTextAreaElement.h" -#include "mozilla/dom/HTMLFormControlsCollection.h" -#include "nsIFormControl.h" - #include "mozilla/FloatingPoint.h" #include "mozilla/Preferences.h" #include "mozilla/TextEditor.h" +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/ContentList.h" +#include "mozilla/dom/HTMLFormControlsCollection.h" +#include "mozilla/dom/HTMLInputElement.h" +#include "mozilla/dom/HTMLMeterElement.h" +#include "mozilla/dom/HTMLTextAreaElement.h" +#include "nsAccUtils.h" +#include "nsEventShell.h" +#include "nsIFormControl.h" +#include "nsTextEquivUtils.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/accessible/html/HTMLFormControlAccessible.h b/accessible/html/HTMLFormControlAccessible.h index 8786e3121888..eb856dc3ef5b 100644 --- a/accessible/html/HTMLFormControlAccessible.h +++ b/accessible/html/HTMLFormControlAccessible.h @@ -5,13 +5,13 @@ #ifndef MOZILLA_A11Y_HTMLFormControlAccessible_H_ #define MOZILLA_A11Y_HTMLFormControlAccessible_H_ +#include "AccAttributes.h" #include "FormControlAccessible.h" #include "HyperTextAccessible.h" +#include "Relation.h" #include "mozilla/a11y/AccTypes.h" #include "mozilla/dom/Element.h" -#include "AccAttributes.h" #include "nsAccUtils.h" -#include "Relation.h" namespace mozilla { class EditorBase; diff --git a/accessible/html/HTMLImageMapAccessible.cpp b/accessible/html/HTMLImageMapAccessible.cpp index daad108dc82b..86ea8cc49efd 100644 --- a/accessible/html/HTMLImageMapAccessible.cpp +++ b/accessible/html/HTMLImageMapAccessible.cpp @@ -7,13 +7,12 @@ #include "ARIAMap.h" #include "EventTree.h" #include "mozilla/a11y/Role.h" - +#include "mozilla/dom/HTMLAreaElement.h" #include "nsCoreUtils.h" #include "nsIFrame.h" #include "nsImageFrame.h" #include "nsImageMap.h" #include "nsLayoutUtils.h" -#include "mozilla/dom/HTMLAreaElement.h" using namespace mozilla::a11y; diff --git a/accessible/html/HTMLLinkAccessible.cpp b/accessible/html/HTMLLinkAccessible.cpp index da0409ee4349..ea03e95f8d9c 100644 --- a/accessible/html/HTMLLinkAccessible.cpp +++ b/accessible/html/HTMLLinkAccessible.cpp @@ -5,14 +5,13 @@ #include "HTMLLinkAccessible.h" #include "CacheConstants.h" -#include "nsCoreUtils.h" -#include "mozilla/a11y/Role.h" #include "States.h" - -#include "nsContentUtils.h" -#include "nsIMutationObserver.h" #include "mozilla/a11y/DocAccessible.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/Element.h" +#include "nsContentUtils.h" +#include "nsCoreUtils.h" +#include "nsIMutationObserver.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/html/HTMLListAccessible.cpp b/accessible/html/HTMLListAccessible.cpp index 1c03800fd73e..40ec95984f48 100644 --- a/accessible/html/HTMLListAccessible.cpp +++ b/accessible/html/HTMLListAccessible.cpp @@ -5,10 +5,9 @@ #include "HTMLListAccessible.h" #include "AccAttributes.h" -#include "nsAccessibilityService.h" -#include "mozilla/a11y/Role.h" #include "States.h" - +#include "mozilla/a11y/Role.h" +#include "nsAccessibilityService.h" #include "nsLayoutUtils.h" using namespace mozilla; diff --git a/accessible/html/HTMLSelectAccessible.cpp b/accessible/html/HTMLSelectAccessible.cpp index 3dbff29eef07..077c6e9fdd25 100644 --- a/accessible/html/HTMLSelectAccessible.cpp +++ b/accessible/html/HTMLSelectAccessible.cpp @@ -4,18 +4,17 @@ #include "HTMLSelectAccessible.h" -#include "LocalAccessible-inl.h" #include "DocAccessible-inl.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" #include "DocAccessible.h" -#include "mozilla/a11y/Role.h" +#include "LocalAccessible-inl.h" #include "States.h" - -#include "nsCOMPtr.h" -#include "mozilla/dom/HTMLOptionElement.h" +#include "mozilla/a11y/Role.h" #include "mozilla/dom/HTMLOptGroupElement.h" +#include "mozilla/dom/HTMLOptionElement.h" #include "mozilla/dom/HTMLSelectElement.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsCOMPtr.h" #include "nsComboboxControlFrame.h" #include "nsContainerFrame.h" #include "nsListControlFrame.h" diff --git a/accessible/html/HTMLTableAccessible.cpp b/accessible/html/HTMLTableAccessible.cpp index 032dcdf9b60b..f0aee814d9cb 100644 --- a/accessible/html/HTMLTableAccessible.cpp +++ b/accessible/html/HTMLTableAccessible.cpp @@ -6,27 +6,25 @@ #include -#include "nsAccessibilityService.h" -#include "AccAttributes.h" #include "ARIAMap.h" +#include "AccAttributes.h" #include "CacheConstants.h" -#include "LocalAccessible-inl.h" #include "DocAccessible-inl.h" -#include "nsTextEquivUtils.h" +#include "LocalAccessible-inl.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" - +#include "mozilla/Assertions.h" +#include "mozilla/a11y/Role.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "mozilla/Assertions.h" +#include "mozilla/dom/ContentList.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/NameSpaceConstants.h" +#include "nsAccessibilityService.h" +#include "nsCOMPtr.h" #include "nsCaseTreatment.h" #include "nsColor.h" -#include "nsCOMPtr.h" #include "nsCoreUtils.h" -#include "mozilla/dom/ContentList.h" #include "nsDebug.h" #include "nsError.h" #include "nsGkAtoms.h" @@ -37,6 +35,7 @@ #include "nsStringFwd.h" #include "nsTableCellFrame.h" #include "nsTableWrapperFrame.h" +#include "nsTextEquivUtils.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/accessible/ios/AccessibleWrap.h b/accessible/ios/AccessibleWrap.h index 7d819044839b..674b74506ec6 100644 --- a/accessible/ios/AccessibleWrap.h +++ b/accessible/ios/AccessibleWrap.h @@ -13,8 +13,8 @@ #include -#include "nsCOMPtr.h" #include "LocalAccessible.h" +#include "nsCOMPtr.h" namespace mozilla { namespace a11y { diff --git a/accessible/ipc/DocAccessibleChild.cpp b/accessible/ipc/DocAccessibleChild.cpp index a103ca71d589..40304f3aebaf 100644 --- a/accessible/ipc/DocAccessibleChild.cpp +++ b/accessible/ipc/DocAccessibleChild.cpp @@ -2,16 +2,16 @@ * 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 "chrome/common/ipc_channel.h" #include "mozilla/a11y/DocAccessibleChild.h" -#include "mozilla/a11y/CacheConstants.h" -#include "mozilla/a11y/FocusManager.h" + +#include "LocalAccessible-inl.h" +#include "chrome/common/ipc_channel.h" #include "mozilla/AppShutdown.h" #include "mozilla/PerfStats.h" #include "mozilla/ProfilerMarkers.h" +#include "mozilla/a11y/CacheConstants.h" +#include "mozilla/a11y/FocusManager.h" #include "nsAccessibilityService.h" - -#include "LocalAccessible-inl.h" #ifdef A11Y_LOG # include "Logging.h" #endif diff --git a/accessible/ipc/DocAccessibleParent.cpp b/accessible/ipc/DocAccessibleParent.cpp index 928b5844dc2d..6bd11670a16d 100644 --- a/accessible/ipc/DocAccessibleParent.cpp +++ b/accessible/ipc/DocAccessibleParent.cpp @@ -2,28 +2,29 @@ * 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 "DocAccessibleParent.h" + #include "ARIAMap.h" #include "CacheConstants.h" #include "CachedTableAccessible.h" -#include "DocAccessibleParent.h" #ifdef MOZ_ENABLE_SKIA_PDF # include "mozilla/a11y/PdfStructTreeBuilder.h" #endif -#include "mozilla/a11y/Platform.h" +#include "Relation.h" +#include "RootAccessible.h" +#include "TextRange.h" #include "mozilla/Components.h" // for mozilla::components +#include "mozilla/PerfStats.h" +#include "mozilla/ProfilerMarkers.h" +#include "mozilla/a11y/Platform.h" #include "mozilla/dom/BrowserBridgeParent.h" #include "mozilla/dom/BrowserParent.h" #include "mozilla/dom/CanonicalBrowsingContext.h" -#include "mozilla/PerfStats.h" -#include "mozilla/ProfilerMarkers.h" -#include "nsAccessibilityService.h" -#include "xpcAccessibleDocument.h" -#include "xpcAccEvents.h" #include "nsAccUtils.h" +#include "nsAccessibilityService.h" #include "nsIIOService.h" -#include "TextRange.h" -#include "Relation.h" -#include "RootAccessible.h" +#include "xpcAccEvents.h" +#include "xpcAccessibleDocument.h" #if defined(XP_WIN) # include "Compatibility.h" diff --git a/accessible/ipc/DocAccessibleParent.h b/accessible/ipc/DocAccessibleParent.h index 035bcfef820e..537330ae5000 100644 --- a/accessible/ipc/DocAccessibleParent.h +++ b/accessible/ipc/DocAccessibleParent.h @@ -5,10 +5,10 @@ #ifndef mozilla_a11y_DocAccessibleParent_h #define mozilla_a11y_DocAccessibleParent_h -#include "nsAccessibilityService.h" #include "mozilla/a11y/PDocAccessibleParent.h" #include "mozilla/a11y/RemoteAccessible.h" #include "mozilla/dom/BrowserBridgeParent.h" +#include "nsAccessibilityService.h" #include "nsClassHashtable.h" #include "nsHashKeys.h" #include "nsIMemoryReporter.h" diff --git a/accessible/ipc/IPCTypes.h b/accessible/ipc/IPCTypes.h index 63baf169efad..3a24dfe65b8f 100644 --- a/accessible/ipc/IPCTypes.h +++ b/accessible/ipc/IPCTypes.h @@ -6,15 +6,15 @@ #define mozilla_a11y_IPCTypes_h #ifdef ACCESSIBILITY -# include "mozilla/a11y/AccAttributes.h" -# include "mozilla/a11y/AccTypes.h" -# include "mozilla/a11y/CacheConstants.h" -# include "mozilla/a11y/Role.h" -# include "mozilla/a11y/AccGroupInfo.h" -# include "mozilla/GfxMessageUtils.h" # include "ipc/EnumSerializer.h" # include "ipc/IPCMessageUtilsSpecializations.h" # include "ipc/nsGUIEventIPC.h" +# include "mozilla/GfxMessageUtils.h" +# include "mozilla/a11y/AccAttributes.h" +# include "mozilla/a11y/AccGroupInfo.h" +# include "mozilla/a11y/AccTypes.h" +# include "mozilla/a11y/CacheConstants.h" +# include "mozilla/a11y/Role.h" namespace IPC { diff --git a/accessible/ipc/RemoteAccessible.cpp b/accessible/ipc/RemoteAccessible.cpp index baa99b3c75ab..194d26f769de 100644 --- a/accessible/ipc/RemoteAccessible.cpp +++ b/accessible/ipc/RemoteAccessible.cpp @@ -2,27 +2,28 @@ * 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 "RemoteAccessible.h" + #include "ARIAMap.h" #include "CachedTableAccessible.h" -#include "RemoteAccessible.h" +#include "Pivot.h" +#include "Relation.h" +#include "TextLeafRange.h" #include "mozilla/a11y/CacheConstants.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/DocManager.h" #include "mozilla/a11y/Platform.h" +#include "mozilla/a11y/RelationType.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "mozilla/dom/Element.h" #include "mozilla/dom/BrowserParent.h" #include "mozilla/dom/CanonicalBrowsingContext.h" +#include "mozilla/dom/Element.h" #include "mozilla/gfx/Matrix.h" -#include "nsAccessibilityService.h" #include "nsAccUtils.h" +#include "nsAccessibilityService.h" #include "nsFocusManager.h" #include "nsTextEquivUtils.h" -#include "Pivot.h" -#include "Relation.h" -#include "TextLeafRange.h" -#include "mozilla/a11y/RelationType.h" #include "xpcAccessibleDocument.h" #ifdef A11Y_LOG diff --git a/accessible/ipc/RemoteAccessible.h b/accessible/ipc/RemoteAccessible.h index dd4a6b482964..941bbf156fc8 100644 --- a/accessible/ipc/RemoteAccessible.h +++ b/accessible/ipc/RemoteAccessible.h @@ -5,16 +5,16 @@ #ifndef mozilla_a11y_RemoteAccessible_h #define mozilla_a11y_RemoteAccessible_h +#include "AccAttributes.h" +#include "LocalAccessible.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/CacheConstants.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" #include "mozilla/a11y/Role.h" -#include "AccAttributes.h" #include "nsIAccessibleText.h" #include "nsIAccessibleTypes.h" -#include "nsTArray.h" #include "nsRect.h" -#include "LocalAccessible.h" +#include "nsTArray.h" namespace mozilla { namespace a11y { diff --git a/accessible/mac/AccessibleWrap.h b/accessible/mac/AccessibleWrap.h index b36e7b141ecf..f3d4dfad95b3 100644 --- a/accessible/mac/AccessibleWrap.h +++ b/accessible/mac/AccessibleWrap.h @@ -16,9 +16,7 @@ #include "LocalAccessible.h" #include "PlatformExtTypes.h" #include "States.h" - #include "nsCOMPtr.h" - #include "nsTArray.h" #if defined(__OBJC__) diff --git a/accessible/other/AccessibleWrap.h b/accessible/other/AccessibleWrap.h index 48695e8a5447..fbaedd1ec394 100644 --- a/accessible/other/AccessibleWrap.h +++ b/accessible/other/AccessibleWrap.h @@ -9,8 +9,8 @@ #ifndef mozilla_a11y_AccessibleWrap_h_ #define mozilla_a11y_AccessibleWrap_h_ -#include "nsCOMPtr.h" #include "LocalAccessible.h" +#include "nsCOMPtr.h" namespace mozilla { namespace a11y { diff --git a/accessible/pdf/PdfStructTreeBuilder.cpp b/accessible/pdf/PdfStructTreeBuilder.cpp index 5d6334d90a10..77e703bfd878 100644 --- a/accessible/pdf/PdfStructTreeBuilder.cpp +++ b/accessible/pdf/PdfStructTreeBuilder.cpp @@ -2,15 +2,16 @@ * 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 "mozilla/a11y/DocAccessible.h" -#include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/PdfStructTreeBuilder.h" -#include "mozilla/a11y/TableCellAccessible.h" + #include "mozilla/ClearOnShutdown.h" -#include "mozilla/dom/BrowserParent.h" -#include "mozilla/dom/CanonicalBrowsingContext.h" #include "mozilla/StaticPrefs_accessibility.h" #include "mozilla/StaticPtr.h" +#include "mozilla/a11y/DocAccessible.h" +#include "mozilla/a11y/DocAccessibleParent.h" +#include "mozilla/a11y/TableCellAccessible.h" +#include "mozilla/dom/BrowserParent.h" +#include "mozilla/dom/CanonicalBrowsingContext.h" #include "skia/include/docs/SkPDFDocument.h" namespace mozilla::a11y { diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp index 8e1c3e047257..94b7134d8436 100644 --- a/accessible/windows/ia2/ia2Accessible.cpp +++ b/accessible/windows/ia2/ia2Accessible.cpp @@ -2,27 +2,24 @@ * 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 "AccessibleWrap.h" - -#include "Accessible2_i.c" +#include "AccAttributes.h" #include "Accessible2_2_i.c" +#include "Accessible2_i.c" #include "AccessibleRole.h" #include "AccessibleStates.h" - -#include "AccAttributes.h" +#include "AccessibleWrap.h" #include "ApplicationAccessible.h" #include "Compatibility.h" -#include "ia2AccessibleRelation.h" #include "IUnknownImpl.h" -#include "nsAccUtils.h" -#include "nsCoreUtils.h" -#include "nsIAccessibleTypes.h" -#include "mozilla/a11y/PDocAccessible.h" #include "Relation.h" #include "TextRange-inl.h" -#include "nsAccessibilityService.h" - +#include "ia2AccessibleRelation.h" #include "mozilla/PresShell.h" +#include "mozilla/a11y/PDocAccessible.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsCoreUtils.h" +#include "nsIAccessibleTypes.h" #include "nsISimpleEnumerator.h" using namespace mozilla; diff --git a/accessible/windows/ia2/ia2Accessible.h b/accessible/windows/ia2/ia2Accessible.h index e28c87eb696d..55ffbc9ad8c8 100644 --- a/accessible/windows/ia2/ia2Accessible.h +++ b/accessible/windows/ia2/ia2Accessible.h @@ -5,11 +5,10 @@ #ifndef mozilla_a11y_ia2Accessible_h_ #define mozilla_a11y_ia2Accessible_h_ +#include "Accessible2_2.h" #include "nsISupports.h" #include "nsTArray.h" -#include "Accessible2_2.h" - namespace mozilla { namespace a11y { class Accessible; diff --git a/accessible/windows/ia2/ia2AccessibleAction.cpp b/accessible/windows/ia2/ia2AccessibleAction.cpp index 834002a181c0..53d754138d6b 100644 --- a/accessible/windows/ia2/ia2AccessibleAction.cpp +++ b/accessible/windows/ia2/ia2AccessibleAction.cpp @@ -5,7 +5,6 @@ #include "ia2AccessibleAction.h" #include "AccessibleAction_i.c" - #include "AccessibleWrap.h" #include "IUnknownImpl.h" #include "MsaaAccessible.h" diff --git a/accessible/windows/ia2/ia2AccessibleAction.h b/accessible/windows/ia2/ia2AccessibleAction.h index e1e61f9725e0..fe059b345c39 100644 --- a/accessible/windows/ia2/ia2AccessibleAction.h +++ b/accessible/windows/ia2/ia2AccessibleAction.h @@ -5,10 +5,9 @@ #ifndef ACCESSIBLE_ACTION_H #define ACCESSIBLE_ACTION_H -#include "nsISupports.h" - -#include "mozilla/a11y/Accessible.h" #include "AccessibleAction.h" +#include "mozilla/a11y/Accessible.h" +#include "nsISupports.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleComponent.cpp b/accessible/windows/ia2/ia2AccessibleComponent.cpp index 7837fdee3db3..2ac07bc64fdb 100644 --- a/accessible/windows/ia2/ia2AccessibleComponent.cpp +++ b/accessible/windows/ia2/ia2AccessibleComponent.cpp @@ -5,12 +5,10 @@ #include "ia2AccessibleComponent.h" #include "AccessibleComponent_i.c" - #include "AccessibleWrap.h" -#include "States.h" #include "IUnknownImpl.h" #include "MsaaAccessible.h" - +#include "States.h" #include "nsIFrame.h" using namespace mozilla::a11y; diff --git a/accessible/windows/ia2/ia2AccessibleEditableText.cpp b/accessible/windows/ia2/ia2AccessibleEditableText.cpp index 06c6f4910f47..32fb20aa0ba8 100644 --- a/accessible/windows/ia2/ia2AccessibleEditableText.cpp +++ b/accessible/windows/ia2/ia2AccessibleEditableText.cpp @@ -3,11 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ia2AccessibleEditableText.h" -#include "ia2AccessibleHypertext.h" #include "AccessibleEditableText_i.c" +#include "ia2AccessibleHypertext.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" - #include "nsCOMPtr.h" #include "nsString.h" diff --git a/accessible/windows/ia2/ia2AccessibleEditableText.h b/accessible/windows/ia2/ia2AccessibleEditableText.h index cc171206df20..86d876d64756 100644 --- a/accessible/windows/ia2/ia2AccessibleEditableText.h +++ b/accessible/windows/ia2/ia2AccessibleEditableText.h @@ -5,9 +5,8 @@ #ifndef ACCESSIBLE_EDITABLETEXT_H #define ACCESSIBLE_EDITABLETEXT_H -#include "nsISupports.h" - #include "AccessibleEditableText.h" +#include "nsISupports.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleHyperlink.cpp b/accessible/windows/ia2/ia2AccessibleHyperlink.cpp index 07e7026c9e74..9b8135fbe6f0 100644 --- a/accessible/windows/ia2/ia2AccessibleHyperlink.cpp +++ b/accessible/windows/ia2/ia2AccessibleHyperlink.cpp @@ -6,7 +6,6 @@ #include "AccessibleHyperlink.h" #include "AccessibleHyperlink_i.c" - #include "AccessibleWrap.h" #include "IUnknownImpl.h" #include "MsaaAccessible.h" diff --git a/accessible/windows/ia2/ia2AccessibleHyperlink.h b/accessible/windows/ia2/ia2AccessibleHyperlink.h index 8652d4017989..616f73277e7c 100644 --- a/accessible/windows/ia2/ia2AccessibleHyperlink.h +++ b/accessible/windows/ia2/ia2AccessibleHyperlink.h @@ -5,10 +5,9 @@ #ifndef ACCESSIBLE_HYPERLINK_H #define ACCESSIBLE_HYPERLINK_H -#include "nsISupports.h" - -#include "ia2AccessibleAction.h" #include "AccessibleHyperlink.h" +#include "ia2AccessibleAction.h" +#include "nsISupports.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleHypertext.cpp b/accessible/windows/ia2/ia2AccessibleHypertext.cpp index b79d73f7e9d1..7b565e8f2e90 100644 --- a/accessible/windows/ia2/ia2AccessibleHypertext.cpp +++ b/accessible/windows/ia2/ia2AccessibleHypertext.cpp @@ -4,12 +4,10 @@ #include "ia2AccessibleHypertext.h" -#include "AccessibleHypertext_i.c" #include "AccessibleHypertext2_i.c" - -#include "mozilla/a11y/HyperTextAccessibleBase.h" - +#include "AccessibleHypertext_i.c" #include "IUnknownImpl.h" +#include "mozilla/a11y/HyperTextAccessibleBase.h" using namespace mozilla::a11y; diff --git a/accessible/windows/ia2/ia2AccessibleHypertext.h b/accessible/windows/ia2/ia2AccessibleHypertext.h index 273024746002..e3d341956dc1 100644 --- a/accessible/windows/ia2/ia2AccessibleHypertext.h +++ b/accessible/windows/ia2/ia2AccessibleHypertext.h @@ -5,14 +5,13 @@ #ifndef ACCESSIBLE_HYPERTEXT_H #define ACCESSIBLE_HYPERTEXT_H -#include "nsISupports.h" - -#include "ia2AccessibleEditableText.h" -#include "ia2AccessibleText.h" -#include "ia2AccessibleTextSelectionContainer.h" #include "AccessibleHypertext2.h" #include "IUnknownImpl.h" #include "MsaaAccessible.h" +#include "ia2AccessibleEditableText.h" +#include "ia2AccessibleText.h" +#include "ia2AccessibleTextSelectionContainer.h" +#include "nsISupports.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleImage.cpp b/accessible/windows/ia2/ia2AccessibleImage.cpp index f2045340e5d6..30acdc93da5a 100644 --- a/accessible/windows/ia2/ia2AccessibleImage.cpp +++ b/accessible/windows/ia2/ia2AccessibleImage.cpp @@ -5,11 +5,9 @@ #include "ia2AccessibleImage.h" #include "AccessibleImage_i.c" - -#include "ImageAccessible.h" #include "IUnknownImpl.h" +#include "ImageAccessible.h" #include "nsIAccessibleTypes.h" - #include "nsString.h" using namespace mozilla; diff --git a/accessible/windows/ia2/ia2AccessibleRelation.cpp b/accessible/windows/ia2/ia2AccessibleRelation.cpp index 4f3bae174ff8..e2ff76868b4a 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.cpp +++ b/accessible/windows/ia2/ia2AccessibleRelation.cpp @@ -4,11 +4,10 @@ #include "ia2AccessibleRelation.h" +#include "AccessibleRelation_i.c" #include "Relation.h" #include "nsID.h" -#include "AccessibleRelation_i.c" - using namespace mozilla::a11y; ia2AccessibleRelation::ia2AccessibleRelation(RelationType aType, Relation* aRel) diff --git a/accessible/windows/ia2/ia2AccessibleRelation.h b/accessible/windows/ia2/ia2AccessibleRelation.h index 57dad1620ac0..1efa9677b098 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.h +++ b/accessible/windows/ia2/ia2AccessibleRelation.h @@ -5,15 +5,14 @@ #ifndef NS_ACCESSIBLE_RELATION_WRAP_H #define NS_ACCESSIBLE_RELATION_WRAP_H -#include "MsaaAccessible.h" -#include "IUnknownImpl.h" - #include -#include "nsTArray.h" -#include "mozilla/a11y/RelationType.h" -#include "mozilla/a11y/Accessible.h" #include "AccessibleRelation.h" +#include "IUnknownImpl.h" +#include "MsaaAccessible.h" +#include "mozilla/a11y/Accessible.h" +#include "mozilla/a11y/RelationType.h" +#include "nsTArray.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleTable.cpp b/accessible/windows/ia2/ia2AccessibleTable.cpp index 9c064620c193..0b578eebf568 100644 --- a/accessible/windows/ia2/ia2AccessibleTable.cpp +++ b/accessible/windows/ia2/ia2AccessibleTable.cpp @@ -5,9 +5,8 @@ #include "ia2AccessibleTable.h" #include "Accessible2.h" -#include "AccessibleTable_i.c" #include "AccessibleTable2_i.c" - +#include "AccessibleTable_i.c" #include "IUnknownImpl.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/TableAccessible.h" diff --git a/accessible/windows/ia2/ia2AccessibleTable.h b/accessible/windows/ia2/ia2AccessibleTable.h index f9af9c9ae089..eb91e896af47 100644 --- a/accessible/windows/ia2/ia2AccessibleTable.h +++ b/accessible/windows/ia2/ia2AccessibleTable.h @@ -7,9 +7,9 @@ #include "AccessibleTable.h" #include "AccessibleTable2.h" -#include "ia2AccessibleHypertext.h" #include "IUnknownImpl.h" #include "UiaGrid.h" +#include "ia2AccessibleHypertext.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleTableCell.cpp b/accessible/windows/ia2/ia2AccessibleTableCell.cpp index b9c2e5aaec60..32cde3803a89 100644 --- a/accessible/windows/ia2/ia2AccessibleTableCell.cpp +++ b/accessible/windows/ia2/ia2AccessibleTableCell.cpp @@ -6,7 +6,6 @@ #include "AccessibleTable2_i.c" #include "AccessibleTableCell_i.c" - #include "IUnknownImpl.h" #include "mozilla/a11y/Accessible.h" #include "mozilla/a11y/TableAccessible.h" diff --git a/accessible/windows/ia2/ia2AccessibleTableCell.h b/accessible/windows/ia2/ia2AccessibleTableCell.h index 3aeff198c30b..6946f659048b 100644 --- a/accessible/windows/ia2/ia2AccessibleTableCell.h +++ b/accessible/windows/ia2/ia2AccessibleTableCell.h @@ -6,9 +6,9 @@ #define ACCESSIBLE_TABLECELL_H #include "AccessibleTableCell.h" -#include "ia2AccessibleHypertext.h" #include "IUnknownImpl.h" #include "UiaGridItem.h" +#include "ia2AccessibleHypertext.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp index 75f75c060e75..478e7b302cdf 100644 --- a/accessible/windows/ia2/ia2AccessibleText.cpp +++ b/accessible/windows/ia2/ia2AccessibleText.cpp @@ -2,15 +2,14 @@ * 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 "ia2Accessible.h" -#include "ia2AccessibleHypertext.h" #include "ia2AccessibleText.h" #include "AccessibleText_i.c" - +#include "ia2Accessible.h" +#include "ia2AccessibleHypertext.h" +#include "mozilla/ClearOnShutdown.h" #include "mozilla/a11y/Compatibility.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" -#include "mozilla/ClearOnShutdown.h" using namespace mozilla::a11y; diff --git a/accessible/windows/ia2/ia2AccessibleTextSelectionContainer.cpp b/accessible/windows/ia2/ia2AccessibleTextSelectionContainer.cpp index 91f4d0e0d8b6..33a09c28e958 100644 --- a/accessible/windows/ia2/ia2AccessibleTextSelectionContainer.cpp +++ b/accessible/windows/ia2/ia2AccessibleTextSelectionContainer.cpp @@ -5,10 +5,10 @@ #include "ia2AccessibleTextSelectionContainer.h" #include "AccessibleTextSelectionContainer_i.c" +#include "TextLeafRange.h" +#include "TextRange.h" #include "ia2AccessibleHypertext.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" -#include "TextRange.h" -#include "TextLeafRange.h" using namespace mozilla::a11y; diff --git a/accessible/windows/ia2/ia2AccessibleValue.cpp b/accessible/windows/ia2/ia2AccessibleValue.cpp index 560340dfb726..b55bf50920d7 100644 --- a/accessible/windows/ia2/ia2AccessibleValue.cpp +++ b/accessible/windows/ia2/ia2AccessibleValue.cpp @@ -5,10 +5,9 @@ #include "ia2AccessibleValue.h" #include "AccessibleValue_i.c" - #include "AccessibleWrap.h" -#include "LocalAccessible-inl.h" #include "IUnknownImpl.h" +#include "LocalAccessible-inl.h" #include "MsaaAccessible.h" using namespace mozilla::a11y; diff --git a/accessible/windows/ia2/ia2AccessibleValue.h b/accessible/windows/ia2/ia2AccessibleValue.h index 59bc41e4ae99..76967f074493 100644 --- a/accessible/windows/ia2/ia2AccessibleValue.h +++ b/accessible/windows/ia2/ia2AccessibleValue.h @@ -5,8 +5,8 @@ #ifndef ACCESSIBLE_VALUE_H #define ACCESSIBLE_VALUE_H -#include "mozilla/a11y/Accessible.h" #include "AccessibleValue.h" +#include "mozilla/a11y/Accessible.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp index 944e4f23ab38..3e9b525906bf 100644 --- a/accessible/windows/msaa/AccessibleWrap.cpp +++ b/accessible/windows/msaa/AccessibleWrap.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccessibleWrap.h" + #include "MsaaAccessible.h" using namespace mozilla; diff --git a/accessible/windows/msaa/ApplicationAccessibleWrap.cpp b/accessible/windows/msaa/ApplicationAccessibleWrap.cpp index 8a25a93195fd..96feb19ebcdf 100644 --- a/accessible/windows/msaa/ApplicationAccessibleWrap.cpp +++ b/accessible/windows/msaa/ApplicationAccessibleWrap.cpp @@ -4,11 +4,11 @@ #include "ApplicationAccessibleWrap.h" -#include "nsIGfxInfo.h" #include "AccAttributes.h" -#include "nsServiceManagerUtils.h" -#include "mozilla/Components.h" #include "MsaaAccessible.h" +#include "mozilla/Components.h" +#include "nsIGfxInfo.h" +#include "nsServiceManagerUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/msaa/Compatibility.cpp b/accessible/windows/msaa/Compatibility.cpp index eed52bc012f3..9646b5ed545d 100644 --- a/accessible/windows/msaa/Compatibility.cpp +++ b/accessible/windows/msaa/Compatibility.cpp @@ -4,20 +4,19 @@ #include "Compatibility.h" -#include "mozilla/WindowsVersion.h" -#include "mozilla/WinHeaderOnlyUtils.h" +#include + +#include "AccessibleWrap.h" +#include "Statistics.h" +#include "mozilla/Preferences.h" #include "mozilla/StaticPrefs_accessibility.h" +#include "mozilla/WinHeaderOnlyUtils.h" +#include "mozilla/WindowsVersion.h" #include "nsExceptionHandler.h" #include "nsIXULRuntime.h" #include "nsPrintfCString.h" #include "nsUnicharUtils.h" #include "nsWinUtils.h" -#include "Statistics.h" -#include "AccessibleWrap.h" - -#include "mozilla/Preferences.h" - -#include using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/msaa/Compatibility.h b/accessible/windows/msaa/Compatibility.h index 37442c05df9f..43429e753136 100644 --- a/accessible/windows/msaa/Compatibility.h +++ b/accessible/windows/msaa/Compatibility.h @@ -5,11 +5,11 @@ #ifndef COMPATIBILITY_MANAGER_H #define COMPATIBILITY_MANAGER_H -#include -#include "nsTArray.h" -#include "nsString.h" - #include +#include + +#include "nsString.h" +#include "nsTArray.h" namespace mozilla::a11y { diff --git a/accessible/windows/msaa/CompatibilityUIA.cpp b/accessible/windows/msaa/CompatibilityUIA.cpp index 34355d988388..2c130b1f483e 100644 --- a/accessible/windows/msaa/CompatibilityUIA.cpp +++ b/accessible/windows/msaa/CompatibilityUIA.cpp @@ -3,18 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Compatibility.h" - -#include "mozilla/a11y/Platform.h" -#include "mozilla/UniquePtrExtensions.h" +#include "NtUndoc.h" #include "mozilla/UniquePtr.h" +#include "mozilla/UniquePtrExtensions.h" #include "mozilla/WindowsVersion.h" +#include "mozilla/a11y/Platform.h" #include "nsReadableUtils.h" #include "nsString.h" #include "nsTHashSet.h" #include "nsWindowsHelpers.h" -#include "NtUndoc.h" - using namespace mozilla; struct ByteArrayDeleter { diff --git a/accessible/windows/msaa/DocAccessibleWrap.cpp b/accessible/windows/msaa/DocAccessibleWrap.cpp index 9df12042922d..5cece5e1bc8e 100644 --- a/accessible/windows/msaa/DocAccessibleWrap.cpp +++ b/accessible/windows/msaa/DocAccessibleWrap.cpp @@ -5,13 +5,13 @@ #include "DocAccessibleWrap.h" #include "Compatibility.h" +#include "DocAccessibleChild.h" +#include "RootAccessible.h" +#include "Statistics.h" #include "mozilla/PresShell.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/Document.h" -#include "DocAccessibleChild.h" #include "nsWinUtils.h" -#include "RootAccessible.h" -#include "Statistics.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/msaa/LazyInstantiator.cpp b/accessible/windows/msaa/LazyInstantiator.cpp index d17799705a3b..6bf3052d32c7 100644 --- a/accessible/windows/msaa/LazyInstantiator.cpp +++ b/accessible/windows/msaa/LazyInstantiator.cpp @@ -4,24 +4,24 @@ #include "LazyInstantiator.h" +#include + #include "MainThreadUtils.h" -#include "mozilla/a11y/LocalAccessible.h" -#include "mozilla/a11y/Compatibility.h" -#include "mozilla/a11y/Platform.h" -#include "mozilla/Assertions.h" -#include "mozilla/mscom/ProcessRuntime.h" -#include "mozilla/WinHeaderOnlyUtils.h" #include "MsaaRootAccessible.h" +#include "WinUtils.h" +#include "mozilla/Assertions.h" +#include "mozilla/WinHeaderOnlyUtils.h" +#include "mozilla/a11y/Compatibility.h" +#include "mozilla/a11y/LocalAccessible.h" +#include "mozilla/a11y/Platform.h" +#include "mozilla/mscom/ProcessRuntime.h" #include "nsAccessibilityService.h" -#include "nsWindowsHelpers.h" #include "nsCOMPtr.h" #include "nsIFile.h" +#include "nsWindowsHelpers.h" #include "nsXPCOM.h" -#include "WinUtils.h" #include "prenv.h" -#include - #if !defined(STATE_SYSTEM_NORMAL) # define STATE_SYSTEM_NORMAL (0) #endif // !defined(STATE_SYSTEM_NORMAL) diff --git a/accessible/windows/msaa/LazyInstantiator.h b/accessible/windows/msaa/LazyInstantiator.h index 874de56a82f3..1c750e53c6c6 100644 --- a/accessible/windows/msaa/LazyInstantiator.h +++ b/accessible/windows/msaa/LazyInstantiator.h @@ -5,16 +5,16 @@ #ifndef mozilla_a11y_LazyInstantiator_h #define mozilla_a11y_LazyInstantiator_h -#include "IUnknownImpl.h" -#include "mozilla/Maybe.h" -#include "mozilla/RefPtr.h" -#include "mozilla/Mutex.h" -#include "nsISupportsImpl.h" -#include "nsString.h" - #include #include +#include "IUnknownImpl.h" +#include "mozilla/Maybe.h" +#include "mozilla/Mutex.h" +#include "mozilla/RefPtr.h" +#include "nsISupportsImpl.h" +#include "nsString.h" + class nsIFile; namespace mozilla { diff --git a/accessible/windows/msaa/MsaaAccessible.cpp b/accessible/windows/msaa/MsaaAccessible.cpp index 1e6e5db56780..e6c2b6d42dc7 100644 --- a/accessible/windows/msaa/MsaaAccessible.cpp +++ b/accessible/windows/msaa/MsaaAccessible.cpp @@ -2,28 +2,29 @@ * 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 "MsaaAccessible.h" + +#include "ARIAMap.h" #include "EnumVariant.h" +#include "HyperTextAccessible-inl.h" +#include "LocalAccessible-inl.h" +#include "MsaaDocAccessible.h" +#include "MsaaRootAccessible.h" +#include "MsaaXULMenuAccessible.h" +#include "Relation.h" +#include "ServiceProvider.h" #include "ia2AccessibleApplication.h" #include "ia2AccessibleHypertext.h" #include "ia2AccessibleImage.h" #include "ia2AccessibleTable.h" #include "ia2AccessibleTableCell.h" -#include "LocalAccessible-inl.h" +#include "mozilla/PresShell.h" #include "mozilla/a11y/AccessibleWrap.h" #include "mozilla/a11y/Compatibility.h" #include "mozilla/a11y/DocAccessibleParent.h" -#include "MsaaAccessible.h" -#include "MsaaDocAccessible.h" -#include "MsaaRootAccessible.h" -#include "MsaaXULMenuAccessible.h" #include "nsEventMap.h" #include "nsWinUtils.h" -#include "Relation.h" #include "sdnAccessible.h" -#include "HyperTextAccessible-inl.h" -#include "ServiceProvider.h" -#include "ARIAMap.h" -#include "mozilla/PresShell.h" using namespace mozilla; using namespace mozilla::a11y; @@ -571,7 +572,7 @@ MsaaAccessible::QueryInterface(REFIID iid, void** ppv) { // IAccessible methods STDMETHODIMP -MsaaAccessible::get_accParent(IDispatch __RPC_FAR* __RPC_FAR* ppdispParent) { +MsaaAccessible::get_accParent(IDispatch __RPC_FAR * __RPC_FAR * ppdispParent) { if (!ppdispParent) return E_INVALIDARG; *ppdispParent = nullptr; @@ -617,7 +618,7 @@ MsaaAccessible::get_accChildCount(long __RPC_FAR* pcountChildren) { STDMETHODIMP MsaaAccessible::get_accChild( /* [in] */ VARIANT varChild, - /* [retval][out] */ IDispatch __RPC_FAR* __RPC_FAR* ppdispChild) { + /* [retval][out] */ IDispatch __RPC_FAR * __RPC_FAR * ppdispChild) { if (!ppdispChild) return E_INVALIDARG; *ppdispChild = nullptr; @@ -939,7 +940,7 @@ class AccessibleEnumerator final : public IEnumVARIANT { mCurIndex = 0; return S_OK; } - STDMETHODIMP Clone(IEnumVARIANT FAR* FAR* ppenum); + STDMETHODIMP Clone(IEnumVARIANT FAR * FAR * ppenum); private: nsTArray> mArray; @@ -988,7 +989,7 @@ AccessibleEnumerator::Next(unsigned long celt, VARIANT FAR* rgvar, } STDMETHODIMP -AccessibleEnumerator::Clone(IEnumVARIANT FAR* FAR* ppenum) { +AccessibleEnumerator::Clone(IEnumVARIANT FAR * FAR * ppenum) { auto newEnum = MakeRefPtr(*this); newEnum.forget(ppenum); return S_OK; diff --git a/accessible/windows/msaa/MsaaAccessible.h b/accessible/windows/msaa/MsaaAccessible.h index d3b7db51f439..fb6322edfddc 100644 --- a/accessible/windows/msaa/MsaaAccessible.h +++ b/accessible/windows/msaa/MsaaAccessible.h @@ -5,12 +5,12 @@ #ifndef mozilla_a11y_MsaaAccessible_h_ #define mozilla_a11y_MsaaAccessible_h_ +#include "IUnknownImpl.h" +#include "MsaaIdGenerator.h" #include "ia2Accessible.h" #include "ia2AccessibleComponent.h" #include "ia2AccessibleHyperlink.h" #include "ia2AccessibleValue.h" -#include "IUnknownImpl.h" -#include "MsaaIdGenerator.h" #include "nsXULAppAPI.h" #include "uiaRawElmProvider.h" @@ -61,13 +61,14 @@ class MsaaAccessible : public ia2Accessible, // IAccessible virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accParent( - /* [retval][out] */ IDispatch __RPC_FAR* __RPC_FAR* ppdispParent) - override; + /* [retval][out] */ IDispatch __RPC_FAR * __RPC_FAR * + ppdispParent) override; virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accChildCount( /* [retval][out] */ long __RPC_FAR* pcountChildren) override; virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accChild( /* [in] */ VARIANT varChild, - /* [retval][out] */ IDispatch __RPC_FAR* __RPC_FAR* ppdispChild) override; + /* [retval][out] */ IDispatch __RPC_FAR * __RPC_FAR * + ppdispChild) override; virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accName( /* [optional][in] */ VARIANT varChild, /* [retval][out] */ BSTR __RPC_FAR* pszName) override; diff --git a/accessible/windows/msaa/MsaaDocAccessible.cpp b/accessible/windows/msaa/MsaaDocAccessible.cpp index b871ed0cdc63..fd61ad5a61bc 100644 --- a/accessible/windows/msaa/MsaaDocAccessible.cpp +++ b/accessible/windows/msaa/MsaaDocAccessible.cpp @@ -4,14 +4,14 @@ #include "MsaaDocAccessible.h" -#include "MsaaDocAccessible.h" #include "DocAccessibleChild.h" -#include "mozilla/a11y/DocAccessibleParent.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" -#include "nsWinUtils.h" -#include "mozilla/a11y/Role.h" #include "ISimpleDOM.h" +#include "MsaaDocAccessible.h" +#include "mozilla/a11y/DocAccessibleParent.h" +#include "mozilla/a11y/Role.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsWinUtils.h" using namespace mozilla; using namespace mozilla::a11y; @@ -53,7 +53,7 @@ IMPL_IUNKNOWN_QUERY_TAIL_INHERITED(ia2AccessibleHypertext) STDMETHODIMP MsaaDocAccessible::get_accParent( - /* [retval][out] */ IDispatch __RPC_FAR* __RPC_FAR* ppdispParent) { + /* [retval][out] */ IDispatch __RPC_FAR * __RPC_FAR * ppdispParent) { if (!mAcc) { return CO_E_OBJNOTCONNECTED; } diff --git a/accessible/windows/msaa/MsaaDocAccessible.h b/accessible/windows/msaa/MsaaDocAccessible.h index 4593c154eb4c..939fe17647d5 100644 --- a/accessible/windows/msaa/MsaaDocAccessible.h +++ b/accessible/windows/msaa/MsaaDocAccessible.h @@ -27,8 +27,8 @@ class MsaaDocAccessible : public ia2AccessibleHypertext { // Override get_accParent for e10s virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accParent( - /* [retval][out] */ IDispatch __RPC_FAR* __RPC_FAR* ppdispParent) - override; + /* [retval][out] */ IDispatch __RPC_FAR * __RPC_FAR * + ppdispParent) override; // Override get_accValue to provide URL when no other value is available virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accValue( diff --git a/accessible/windows/msaa/MsaaIdGenerator.cpp b/accessible/windows/msaa/MsaaIdGenerator.cpp index c7c3cddd9354..0329e5287b9d 100644 --- a/accessible/windows/msaa/MsaaIdGenerator.cpp +++ b/accessible/windows/msaa/MsaaIdGenerator.cpp @@ -4,9 +4,9 @@ #include "MsaaIdGenerator.h" +#include "MsaaAccessible.h" #include "mozilla/Assertions.h" #include "mozilla/ClearOnShutdown.h" -#include "MsaaAccessible.h" #include "nsAccessibilityService.h" namespace mozilla { diff --git a/accessible/windows/msaa/MsaaIdGenerator.h b/accessible/windows/msaa/MsaaIdGenerator.h index ccb38f3a6792..3f8ca487ca9a 100644 --- a/accessible/windows/msaa/MsaaIdGenerator.h +++ b/accessible/windows/msaa/MsaaIdGenerator.h @@ -5,9 +5,8 @@ #ifndef mozilla_a11y_MsaaIdGenerator_h #define mozilla_a11y_MsaaIdGenerator_h -#include "mozilla/a11y/IDSet.h" - #include "mozilla/NotNull.h" +#include "mozilla/a11y/IDSet.h" #include "nsITimer.h" namespace mozilla { diff --git a/accessible/windows/msaa/MsaaRootAccessible.cpp b/accessible/windows/msaa/MsaaRootAccessible.cpp index e3b7ca0d4bbb..456ff104d6d3 100644 --- a/accessible/windows/msaa/MsaaRootAccessible.cpp +++ b/accessible/windows/msaa/MsaaRootAccessible.cpp @@ -2,15 +2,16 @@ * 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 "MsaaRootAccessible.h" + +#include + +#include "EnumVariant.h" +#include "Relation.h" +#include "RootAccessible.h" #include "mozilla/a11y/Compatibility.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/dom/BrowserParent.h" -#include "MsaaRootAccessible.h" -#include "Relation.h" -#include "RootAccessible.h" -#include "EnumVariant.h" - -#include using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/msaa/MsaaRootAccessible.h b/accessible/windows/msaa/MsaaRootAccessible.h index f665e018f314..6486d2496f9b 100644 --- a/accessible/windows/msaa/MsaaRootAccessible.h +++ b/accessible/windows/msaa/MsaaRootAccessible.h @@ -5,9 +5,9 @@ #ifndef mozilla_a11y_MsaaRootAccessible_h_ #define mozilla_a11y_MsaaRootAccessible_h_ -#include "mozilla/mscom/Aggregation.h" #include "MsaaDocAccessible.h" #include "UiaRoot.h" +#include "mozilla/mscom/Aggregation.h" namespace mozilla { diff --git a/accessible/windows/msaa/MsaaXULMenuAccessible.cpp b/accessible/windows/msaa/MsaaXULMenuAccessible.cpp index 91559fc8e958..c6ac22dddbff 100644 --- a/accessible/windows/msaa/MsaaXULMenuAccessible.cpp +++ b/accessible/windows/msaa/MsaaXULMenuAccessible.cpp @@ -3,10 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MsaaXULMenuAccessible.h" -#include "mozilla/dom/NameSpaceConstants.h" -#include "mozilla/dom/Element.h" -#include "mozilla/a11y/AccessibleWrap.h" + #include "LocalAccessible-inl.h" +#include "mozilla/a11y/AccessibleWrap.h" +#include "mozilla/dom/Element.h" +#include "mozilla/dom/NameSpaceConstants.h" #include "nsGkAtoms.h" using namespace mozilla::a11y; diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp index 9f27c8fe3454..d35e55a3c9d4 100644 --- a/accessible/windows/msaa/Platform.cpp +++ b/accessible/windows/msaa/Platform.cpp @@ -7,13 +7,13 @@ #include "AccEvent.h" #include "Compatibility.h" #include "MsaaAccessible.h" -#include "nsWinUtils.h" +#include "ia2AccessibleText.h" +#include "mozilla/StaticPtr.h" +#include "mozilla/WinHeaderOnlyUtils.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" #include "mozilla/a11y/RemoteAccessible.h" -#include "mozilla/StaticPtr.h" -#include "mozilla/WinHeaderOnlyUtils.h" -#include "ia2AccessibleText.h" +#include "nsWinUtils.h" #if defined(MOZ_TELEMETRY_REPORTING) # include "mozilla/glean/AccessibleMetrics.h" diff --git a/accessible/windows/msaa/ServiceProvider.cpp b/accessible/windows/msaa/ServiceProvider.cpp index a63a0b9b0379..eb9196e3786a 100644 --- a/accessible/windows/msaa/ServiceProvider.cpp +++ b/accessible/windows/msaa/ServiceProvider.cpp @@ -7,16 +7,14 @@ #include "AccessibleApplication_i.c" #include "ApplicationAccessibleWrap.h" #include "DocAccessible.h" -#include "nsAccUtils.h" -#include "nsCoreUtils.h" +#include "ISimpleDOM.h" #include "Relation.h" #include "RootAccessible.h" -#include "uiaRawElmProvider.h" - #include "mozilla/a11y/Compatibility.h" #include "mozilla/a11y/DocAccessibleChild.h" - -#include "ISimpleDOM.h" +#include "nsAccUtils.h" +#include "nsCoreUtils.h" +#include "uiaRawElmProvider.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/msaa/nsEventMap.h b/accessible/windows/msaa/nsEventMap.h index 956d7cfc39a2..095ad3039ae7 100644 --- a/accessible/windows/msaa/nsEventMap.h +++ b/accessible/windows/msaa/nsEventMap.h @@ -6,6 +6,7 @@ #define ACCESSIBLE_WINDOWS_MSAA_NSEVENTMAP_H_ #include + #include "AccessibleEventId.h" const uint32_t kEVENT_WIN_UNKNOWN = 0x00000000; diff --git a/accessible/windows/msaa/nsWinUtils.cpp b/accessible/windows/msaa/nsWinUtils.cpp index 1f622e009426..71fb544548a1 100644 --- a/accessible/windows/msaa/nsWinUtils.cpp +++ b/accessible/windows/msaa/nsWinUtils.cpp @@ -7,14 +7,13 @@ #include "Compatibility.h" #include "DocAccessible.h" #include "MsaaAccessible.h" -#include "nsAccessibilityService.h" -#include "nsCoreUtils.h" - -#include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/Preferences.h" -#include "nsArrayUtils.h" +#include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/Element.h" +#include "nsAccessibilityService.h" +#include "nsArrayUtils.h" +#include "nsCoreUtils.h" #include "nsXULAppAPI.h" using namespace mozilla; diff --git a/accessible/windows/msaa/nsWinUtils.h b/accessible/windows/msaa/nsWinUtils.h index e550f5265f7b..ca8a1c42d558 100644 --- a/accessible/windows/msaa/nsWinUtils.h +++ b/accessible/windows/msaa/nsWinUtils.h @@ -5,11 +5,12 @@ #ifndef nsWinUtils_h_ #define nsWinUtils_h_ -#include #include -#include "nsICSSDeclaration.h" +#include + #include "nsCOMPtr.h" +#include "nsICSSDeclaration.h" class nsIContent; diff --git a/accessible/windows/sdn/sdnAccessible.cpp b/accessible/windows/sdn/sdnAccessible.cpp index 7c655db7ad42..fa0eab43e54e 100644 --- a/accessible/windows/sdn/sdnAccessible.cpp +++ b/accessible/windows/sdn/sdnAccessible.cpp @@ -108,33 +108,34 @@ sdnAccessible::scrollTo(boolean aScrollTopLeft) { } STDMETHODIMP -sdnAccessible::get_parentNode(ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode) { +sdnAccessible::get_parentNode(ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode) { return E_NOTIMPL; } STDMETHODIMP -sdnAccessible::get_firstChild(ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode) { +sdnAccessible::get_firstChild(ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode) { return E_NOTIMPL; } STDMETHODIMP -sdnAccessible::get_lastChild(ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode) { +sdnAccessible::get_lastChild(ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode) { return E_NOTIMPL; } STDMETHODIMP -sdnAccessible::get_previousSibling(ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode) { +sdnAccessible::get_previousSibling(ISimpleDOMNode __RPC_FAR * __RPC_FAR * + aNode) { return E_NOTIMPL; } STDMETHODIMP -sdnAccessible::get_nextSibling(ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode) { +sdnAccessible::get_nextSibling(ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode) { return E_NOTIMPL; } STDMETHODIMP sdnAccessible::get_childAt(unsigned aChildIndex, - ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode) { + ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode) { return E_NOTIMPL; } @@ -173,7 +174,8 @@ sdnAccessible::get_innerHTML(BSTR __RPC_FAR* aInnerHTML) { } STDMETHODIMP -sdnAccessible::get_localInterface(void __RPC_FAR* __RPC_FAR* aLocalInterface) { +sdnAccessible::get_localInterface(void __RPC_FAR * __RPC_FAR * + aLocalInterface) { if (!aLocalInterface) return E_INVALIDARG; *aLocalInterface = nullptr; diff --git a/accessible/windows/sdn/sdnAccessible.h b/accessible/windows/sdn/sdnAccessible.h index 536c464621f9..bb2d548c7e1c 100644 --- a/accessible/windows/sdn/sdnAccessible.h +++ b/accessible/windows/sdn/sdnAccessible.h @@ -8,7 +8,6 @@ #include "ISimpleDOM.h" #include "IUnknownImpl.h" #include "MsaaAccessible.h" - #include "mozilla/NotNull.h" namespace mozilla { @@ -60,29 +59,29 @@ class sdnAccessible final : public ISimpleDOMNode { virtual HRESULT STDMETHODCALLTYPE scrollTo(/* [in] */ boolean aScrollTopLeft); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_parentNode( - /* [out][retval] */ ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode); + /* [out][retval] */ ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_firstChild( - /* [out][retval] */ ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode); + /* [out][retval] */ ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_lastChild( - /* [out][retval] */ ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode); + /* [out][retval] */ ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_previousSibling( - /* [out][retval] */ ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode); + /* [out][retval] */ ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_nextSibling( - /* [out][retval] */ ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode); + /* [out][retval] */ ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_childAt( /* [in] */ unsigned aChildIndex, - /* [out][retval] */ ISimpleDOMNode __RPC_FAR* __RPC_FAR* aNode); + /* [out][retval] */ ISimpleDOMNode __RPC_FAR * __RPC_FAR * aNode); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_innerHTML( /* [out][retval] */ BSTR __RPC_FAR* aInnerHTML); virtual /* [local][propget] */ HRESULT STDMETHODCALLTYPE get_localInterface( - /* [retval][out] */ void __RPC_FAR* __RPC_FAR* aLocalInterface); + /* [retval][out] */ void __RPC_FAR * __RPC_FAR * aLocalInterface); virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_language( /* [out][retval] */ BSTR __RPC_FAR* aLanguage); diff --git a/accessible/windows/uia/UiaGrid.cpp b/accessible/windows/uia/UiaGrid.cpp index 9e7f262f9647..080f26167ab7 100644 --- a/accessible/windows/uia/UiaGrid.cpp +++ b/accessible/windows/uia/UiaGrid.cpp @@ -2,11 +2,12 @@ * 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 "UiaGrid.h" + +#include "Pivot.h" #include "ia2AccessibleTable.h" #include "mozilla/a11y/TableAccessible.h" #include "nsIAccessiblePivot.h" -#include "Pivot.h" -#include "UiaGrid.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/uia/UiaGridItem.cpp b/accessible/windows/uia/UiaGridItem.cpp index 3a555ab86ff9..0328444b15dd 100644 --- a/accessible/windows/uia/UiaGridItem.cpp +++ b/accessible/windows/uia/UiaGridItem.cpp @@ -2,10 +2,11 @@ * 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 "UiaGridItem.h" + #include "ia2AccessibleTableCell.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "UiaGridItem.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/windows/uia/UiaText.cpp b/accessible/windows/uia/UiaText.cpp index ab4d9c550eaf..a9d166aa38db 100644 --- a/accessible/windows/uia/UiaText.cpp +++ b/accessible/windows/uia/UiaText.cpp @@ -5,9 +5,9 @@ #include "UiaText.h" #include "MsaaAccessible.h" -#include "mozilla/a11y/States.h" #include "TextLeafRange.h" #include "UiaTextRange.h" +#include "mozilla/a11y/States.h" namespace mozilla::a11y { diff --git a/accessible/windows/uia/UiaText.h b/accessible/windows/uia/UiaText.h index 367f86e28372..1ce55a5d2e71 100644 --- a/accessible/windows/uia/UiaText.h +++ b/accessible/windows/uia/UiaText.h @@ -5,11 +5,10 @@ #ifndef mozilla_a11y_UiaText_h_ #define mozilla_a11y_UiaText_h_ -#include "objbase.h" -#include "uiautomation.h" - #include "IUnknownImpl.h" #include "mozilla/RefPtr.h" +#include "objbase.h" +#include "uiautomation.h" namespace mozilla::a11y { class Accessible; diff --git a/accessible/windows/uia/UiaTextRange.cpp b/accessible/windows/uia/UiaTextRange.cpp index d4a7d23e3412..3ee624fe0974 100644 --- a/accessible/windows/uia/UiaTextRange.cpp +++ b/accessible/windows/uia/UiaTextRange.cpp @@ -4,13 +4,15 @@ #include "UiaTextRange.h" +#include +#include + +#include + +#include "TextLeafRange.h" #include "mozilla/a11y/HyperTextAccessibleBase.h" #include "nsAccUtils.h" #include "nsIAccessibleTypes.h" -#include "TextLeafRange.h" -#include -#include -#include namespace mozilla::a11y { diff --git a/accessible/windows/uia/uiaRawElmProvider.cpp b/accessible/windows/uia/uiaRawElmProvider.cpp index f29cd9b3ff00..fc4dabbd2234 100644 --- a/accessible/windows/uia/uiaRawElmProvider.cpp +++ b/accessible/windows/uia/uiaRawElmProvider.cpp @@ -7,27 +7,27 @@ #include #include +#include "ARIAMap.h" #include "AccAttributes.h" #include "AccessibleWrap.h" #include "ApplicationAccessible.h" -#include "ARIAMap.h" #include "LocalAccessible-inl.h" -#include "mozilla/a11y/Compatibility.h" -#include "mozilla/a11y/RemoteAccessible.h" -#include "mozilla/DynamicallyLinkedFunctionPtr.h" #include "MsaaAccessible.h" #include "MsaaRootAccessible.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" -#include "nsIAccessibleAnnouncementEvent.h" -#include "nsIAccessiblePivot.h" -#include "nsTextEquivUtils.h" #include "Pivot.h" #include "Relation.h" #include "RootAccessible.h" #include "TextLeafRange.h" #include "UiaText.h" #include "UiaTextRange.h" +#include "mozilla/DynamicallyLinkedFunctionPtr.h" +#include "mozilla/a11y/Compatibility.h" +#include "mozilla/a11y/RemoteAccessible.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsIAccessibleAnnouncementEvent.h" +#include "nsIAccessiblePivot.h" +#include "nsTextEquivUtils.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/xpcom/nsAccessibleRelation.cpp b/accessible/xpcom/nsAccessibleRelation.cpp index 660cd8f3442c..402fa0896619 100644 --- a/accessible/xpcom/nsAccessibleRelation.cpp +++ b/accessible/xpcom/nsAccessibleRelation.cpp @@ -5,10 +5,9 @@ #include "nsAccessibleRelation.h" #include "Relation.h" -#include "xpcAccessibleDocument.h" - #include "nsArrayUtils.h" #include "nsComponentManagerUtils.h" +#include "xpcAccessibleDocument.h" using namespace mozilla::a11y; diff --git a/accessible/xpcom/nsAccessibleRelation.h b/accessible/xpcom/nsAccessibleRelation.h index d140c092eb90..7ab57f8faa2c 100644 --- a/accessible/xpcom/nsAccessibleRelation.h +++ b/accessible/xpcom/nsAccessibleRelation.h @@ -5,12 +5,11 @@ #ifndef _nsAccessibleRelation_H_ #define _nsAccessibleRelation_H_ -#include "nsIAccessibleRelation.h" - -#include "nsCOMPtr.h" -#include "nsTArray.h" -#include "nsIMutableArray.h" #include "mozilla/a11y/RemoteAccessible.h" +#include "nsCOMPtr.h" +#include "nsIAccessibleRelation.h" +#include "nsIMutableArray.h" +#include "nsTArray.h" namespace mozilla { namespace a11y { diff --git a/accessible/xpcom/xpcAccessibilityService.cpp b/accessible/xpcom/xpcAccessibilityService.cpp index 7d5870bc24e8..8c4e87c68dd6 100644 --- a/accessible/xpcom/xpcAccessibilityService.cpp +++ b/accessible/xpcom/xpcAccessibilityService.cpp @@ -5,11 +5,10 @@ #include "xpcAccessibilityService.h" #include "mozilla/dom/Document.h" - -#include "xpcAccessiblePivot.h" #include "nsAccessibilityService.h" #include "xpcAccessibleApplication.h" #include "xpcAccessibleDocument.h" +#include "xpcAccessiblePivot.h" #include "xpcAccessibleTextLeafRange.h" #ifdef A11Y_LOG diff --git a/accessible/xpcom/xpcAccessible.cpp b/accessible/xpcom/xpcAccessible.cpp index 500a7a338950..e0c0c6afa0a2 100644 --- a/accessible/xpcom/xpcAccessible.cpp +++ b/accessible/xpcom/xpcAccessible.cpp @@ -3,17 +3,16 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "AccAttributes.h" +#include "Relation.h" +#include "RootAccessible.h" #include "nsAccUtils.h" +#include "nsAccessibleRelation.h" #include "nsComponentManagerUtils.h" #include "nsIAccessibleRelation.h" #include "nsIAccessibleRole.h" -#include "nsAccessibleRelation.h" -#include "Relation.h" -#include "RootAccessible.h" -#include "xpcAccessibleDocument.h" - #include "nsIMutableArray.h" #include "nsPersistentProperties.h" +#include "xpcAccessibleDocument.h" #ifdef MOZ_WIDGET_COCOA # include "xpcAccessibleMacInterface.h" diff --git a/accessible/xpcom/xpcAccessibleApplication.h b/accessible/xpcom/xpcAccessibleApplication.h index 95945e780244..35180d6ed524 100644 --- a/accessible/xpcom/xpcAccessibleApplication.h +++ b/accessible/xpcom/xpcAccessibleApplication.h @@ -5,8 +5,8 @@ #ifndef mozilla_a11y_xpcAccessibleApplication_h_ #define mozilla_a11y_xpcAccessibleApplication_h_ -#include "nsIAccessibleApplication.h" #include "ApplicationAccessible.h" +#include "nsIAccessibleApplication.h" #include "xpcAccessibleGeneric.h" namespace mozilla { diff --git a/accessible/xpcom/xpcAccessibleDocument.cpp b/accessible/xpcom/xpcAccessibleDocument.cpp index 30c6427da330..7a147a977596 100644 --- a/accessible/xpcom/xpcAccessibleDocument.cpp +++ b/accessible/xpcom/xpcAccessibleDocument.cpp @@ -3,14 +3,14 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "xpcAccessibleDocument.h" -#include "xpcAccessibleImage.h" -#include "xpcAccessibleTable.h" -#include "xpcAccessibleTableCell.h" -#include "nsAccUtils.h" #include "DocAccessible-inl.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/dom/CanonicalBrowsingContext.h" +#include "nsAccUtils.h" +#include "xpcAccessibleImage.h" +#include "xpcAccessibleTable.h" +#include "xpcAccessibleTableCell.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/xpcom/xpcAccessibleDocument.h b/accessible/xpcom/xpcAccessibleDocument.h index 4628a7f26460..d7717e290309 100644 --- a/accessible/xpcom/xpcAccessibleDocument.h +++ b/accessible/xpcom/xpcAccessibleDocument.h @@ -5,10 +5,9 @@ #ifndef mozilla_a11y_xpcAccessibleDocument_h_ #define mozilla_a11y_xpcAccessibleDocument_h_ -#include "nsIAccessibleDocument.h" - #include "DocAccessible.h" #include "nsAccessibilityService.h" +#include "nsIAccessibleDocument.h" #include "xpcAccessibleApplication.h" #include "xpcAccessibleHyperText.h" diff --git a/accessible/xpcom/xpcAccessibleGeneric.h b/accessible/xpcom/xpcAccessibleGeneric.h index 73297b8c1cd0..5c03de396af1 100644 --- a/accessible/xpcom/xpcAccessibleGeneric.h +++ b/accessible/xpcom/xpcAccessibleGeneric.h @@ -5,15 +5,14 @@ #ifndef mozilla_a11y_xpcAccessibleGeneric_h_ #define mozilla_a11y_xpcAccessibleGeneric_h_ +#include "LocalAccessible.h" +#include "mozilla/a11y/Accessible.h" +#include "mozilla/a11y/RemoteAccessible.h" #include "xpcAccessible.h" #include "xpcAccessibleHyperLink.h" #include "xpcAccessibleSelectable.h" #include "xpcAccessibleValue.h" -#include "LocalAccessible.h" -#include "mozilla/a11y/Accessible.h" -#include "mozilla/a11y/RemoteAccessible.h" - namespace mozilla { namespace a11y { diff --git a/accessible/xpcom/xpcAccessibleHyperLink.h b/accessible/xpcom/xpcAccessibleHyperLink.h index 7c017216b3d5..264294a42620 100644 --- a/accessible/xpcom/xpcAccessibleHyperLink.h +++ b/accessible/xpcom/xpcAccessibleHyperLink.h @@ -5,9 +5,8 @@ #ifndef mozilla_a11y_xpcAccessibleHyperLink_h_ #define mozilla_a11y_xpcAccessibleHyperLink_h_ -#include "nsIAccessibleHyperLink.h" - #include "mozilla/a11y/Accessible.h" +#include "nsIAccessibleHyperLink.h" class nsIAccessible; diff --git a/accessible/xpcom/xpcAccessibleHyperText.cpp b/accessible/xpcom/xpcAccessibleHyperText.cpp index 19d0912df948..9b72ffdf5ce2 100644 --- a/accessible/xpcom/xpcAccessibleHyperText.cpp +++ b/accessible/xpcom/xpcAccessibleHyperText.cpp @@ -4,15 +4,14 @@ #include "xpcAccessibleHyperText.h" -#include "TextRange.h" #include "AccAttributes.h" +#include "TextRange.h" #include "nsComponentManagerUtils.h" +#include "nsIMutableArray.h" #include "nsPersistentProperties.h" #include "xpcAccessibleDocument.h" #include "xpcAccessibleTextRange.h" -#include "nsIMutableArray.h" - using namespace mozilla::a11y; //////////////////////////////////////////////////////////////////////////////// diff --git a/accessible/xpcom/xpcAccessibleHyperText.h b/accessible/xpcom/xpcAccessibleHyperText.h index ea1a9fb8a24b..49cf217aba68 100644 --- a/accessible/xpcom/xpcAccessibleHyperText.h +++ b/accessible/xpcom/xpcAccessibleHyperText.h @@ -5,11 +5,10 @@ #ifndef mozilla_a11y_xpcAccessibleHyperText_h_ #define mozilla_a11y_xpcAccessibleHyperText_h_ -#include "nsIAccessibleText.h" -#include "nsIAccessibleHyperText.h" -#include "nsIAccessibleEditableText.h" - #include "HyperTextAccessible.h" +#include "nsIAccessibleEditableText.h" +#include "nsIAccessibleHyperText.h" +#include "nsIAccessibleText.h" #include "xpcAccessibleGeneric.h" namespace mozilla { diff --git a/accessible/xpcom/xpcAccessibleImage.h b/accessible/xpcom/xpcAccessibleImage.h index 86e6e7e58a48..b7135d4e434b 100644 --- a/accessible/xpcom/xpcAccessibleImage.h +++ b/accessible/xpcom/xpcAccessibleImage.h @@ -6,7 +6,6 @@ #define mozilla_a11y_xpcAccessibleImage_h_ #include "nsIAccessibleImage.h" - #include "xpcAccessibleGeneric.h" namespace mozilla { diff --git a/accessible/xpcom/xpcAccessibleMacInterface.mm b/accessible/xpcom/xpcAccessibleMacInterface.mm index 6701503b9ac9..44a4ecd69c77 100644 --- a/accessible/xpcom/xpcAccessibleMacInterface.mm +++ b/accessible/xpcom/xpcAccessibleMacInterface.mm @@ -6,15 +6,15 @@ #include "xpcAccessibleMacInterface.h" +#include "js/PropertyAndElement.h" // JS_Enumerate, JS_GetElement, JS_GetProperty, JS_GetPropertyById, JS_HasOwnProperty, JS_SetUCProperty +#include "mozilla/Services.h" +#include "mozilla/dom/ToJSValue.h" #include "nsCocoaUtils.h" #include "nsContentUtils.h" #include "nsIObserverService.h" #include "nsISimpleEnumerator.h" #include "nsIXPConnect.h" -#include "mozilla/dom/ToJSValue.h" -#include "mozilla/Services.h" #include "nsString.h" -#include "js/PropertyAndElement.h" // JS_Enumerate, JS_GetElement, JS_GetProperty, JS_GetPropertyById, JS_HasOwnProperty, JS_SetUCProperty #import #import diff --git a/accessible/xpcom/xpcAccessiblePivot.cpp b/accessible/xpcom/xpcAccessiblePivot.cpp index db26be44de50..94cbec5e5d36 100644 --- a/accessible/xpcom/xpcAccessiblePivot.cpp +++ b/accessible/xpcom/xpcAccessiblePivot.cpp @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "xpcAccessiblePivot.h" -#include "xpcAccessibleDocument.h" #include "Pivot.h" +#include "xpcAccessibleDocument.h" using namespace mozilla::a11y; diff --git a/accessible/xpcom/xpcAccessiblePivot.h b/accessible/xpcom/xpcAccessiblePivot.h index 1498f8dde0f5..96e97f376ceb 100644 --- a/accessible/xpcom/xpcAccessiblePivot.h +++ b/accessible/xpcom/xpcAccessiblePivot.h @@ -5,10 +5,9 @@ #ifndef _xpcAccessiblePivot_H_ #define _xpcAccessiblePivot_H_ -#include "nsIAccessiblePivot.h" - #include "Accessible.h" #include "nsCycleCollectionParticipant.h" +#include "nsIAccessiblePivot.h" #include "xpcAccessible.h" namespace mozilla::a11y { diff --git a/accessible/xpcom/xpcAccessibleSelectable.cpp b/accessible/xpcom/xpcAccessibleSelectable.cpp index aadee7dfd52f..88cba81d2d32 100644 --- a/accessible/xpcom/xpcAccessibleSelectable.cpp +++ b/accessible/xpcom/xpcAccessibleSelectable.cpp @@ -2,11 +2,12 @@ * 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 "xpcAccessibleSelectable.h" + #include "nsComponentManagerUtils.h" #include "nsIAccessible.h" #include "nsIMutableArray.h" #include "xpcAccessibleDocument.h" -#include "xpcAccessibleSelectable.h" using namespace mozilla::a11y; diff --git a/accessible/xpcom/xpcAccessibleTable.cpp b/accessible/xpcom/xpcAccessibleTable.cpp index 949d917150d3..2a2356ed78db 100644 --- a/accessible/xpcom/xpcAccessibleTable.cpp +++ b/accessible/xpcom/xpcAccessibleTable.cpp @@ -5,9 +5,8 @@ #include "xpcAccessibleTable.h" #include "mozilla/a11y/TableAccessible.h" - -#include "nsIMutableArray.h" #include "nsComponentManagerUtils.h" +#include "nsIMutableArray.h" #include "xpcAccessibleDocument.h" using namespace mozilla::a11y; diff --git a/accessible/xpcom/xpcAccessibleTableCell.cpp b/accessible/xpcom/xpcAccessibleTableCell.cpp index 80519e8f7c83..18f3ded4eefb 100644 --- a/accessible/xpcom/xpcAccessibleTableCell.cpp +++ b/accessible/xpcom/xpcAccessibleTableCell.cpp @@ -6,9 +6,8 @@ #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "nsIAccessibleTable.h" - #include "nsComponentManagerUtils.h" +#include "nsIAccessibleTable.h" #include "nsIMutableArray.h" #include "xpcAccessibleDocument.h" diff --git a/accessible/xpcom/xpcAccessibleTableCell.h b/accessible/xpcom/xpcAccessibleTableCell.h index 9ee514b1bb0f..9bc3956cd87f 100644 --- a/accessible/xpcom/xpcAccessibleTableCell.h +++ b/accessible/xpcom/xpcAccessibleTableCell.h @@ -6,7 +6,6 @@ #define mozilla_a11y_xpcom_xpcAccessibletableCell_h_ #include "nsIAccessibleTable.h" - #include "xpcAccessibleHyperText.h" namespace mozilla { diff --git a/accessible/xpcom/xpcAccessibleTextLeafRange.cpp b/accessible/xpcom/xpcAccessibleTextLeafRange.cpp index 6ebf294dd931..c75742ed0611 100644 --- a/accessible/xpcom/xpcAccessibleTextLeafRange.cpp +++ b/accessible/xpcom/xpcAccessibleTextLeafRange.cpp @@ -4,8 +4,8 @@ #include "xpcAccessibleTextLeafRange.h" -#include "nsIAccessible.h" #include "TextLeafRange.h" +#include "nsIAccessible.h" #include "xpcAccessibleDocument.h" using namespace mozilla; diff --git a/accessible/xpcom/xpcAccessibleTextRange.cpp b/accessible/xpcom/xpcAccessibleTextRange.cpp index 683f318c8ac8..9bfbd5690879 100644 --- a/accessible/xpcom/xpcAccessibleTextRange.cpp +++ b/accessible/xpcom/xpcAccessibleTextRange.cpp @@ -5,7 +5,6 @@ #include "xpcAccessibleTextRange.h" #include "TextRange-inl.h" - #include "nsQueryObject.h" #include "xpcAccessibleDocument.h" diff --git a/accessible/xpcom/xpcAccessibleValue.cpp b/accessible/xpcom/xpcAccessibleValue.cpp index 3de86f9e35cd..c56e25143922 100644 --- a/accessible/xpcom/xpcAccessibleValue.cpp +++ b/accessible/xpcom/xpcAccessibleValue.cpp @@ -2,9 +2,9 @@ * 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 "xpcAccessibleGeneric.h" -#include "LocalAccessible.h" #include "LocalAccessible-inl.h" +#include "LocalAccessible.h" +#include "xpcAccessibleGeneric.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/xul/XULAlertAccessible.cpp b/accessible/xul/XULAlertAccessible.cpp index e67cb64d4c8f..03ff1c840e2a 100644 --- a/accessible/xul/XULAlertAccessible.cpp +++ b/accessible/xul/XULAlertAccessible.cpp @@ -5,8 +5,8 @@ #include "XULAlertAccessible.h" #include "LocalAccessible-inl.h" -#include "mozilla/a11y/Role.h" #include "States.h" +#include "mozilla/a11y/Role.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULComboboxAccessible.cpp b/accessible/xul/XULComboboxAccessible.cpp index e8002ec0e158..d3d2c10964ac 100644 --- a/accessible/xul/XULComboboxAccessible.cpp +++ b/accessible/xul/XULComboboxAccessible.cpp @@ -4,17 +4,15 @@ #include "XULComboboxAccessible.h" -#include "LocalAccessible-inl.h" -#include "nsAccessibilityService.h" #include "DocAccessible.h" -#include "nsCoreUtils.h" -#include "nsFocusManager.h" - +#include "LocalAccessible-inl.h" +#include "States.h" #include "mozilla/a11y/DocAccessibleParent.h" #include "mozilla/a11y/Role.h" -#include "States.h" - #include "mozilla/dom/Element.h" +#include "nsAccessibilityService.h" +#include "nsCoreUtils.h" +#include "nsFocusManager.h" #include "nsIDOMXULMenuListElement.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULElementAccessibles.cpp b/accessible/xul/XULElementAccessibles.cpp index d4e7bc7d37b8..d1b52d9d771b 100644 --- a/accessible/xul/XULElementAccessibles.cpp +++ b/accessible/xul/XULElementAccessibles.cpp @@ -4,16 +4,16 @@ #include "XULElementAccessibles.h" -#include "LocalAccessible-inl.h" #include "BaseAccessibles.h" #include "DocAccessible-inl.h" +#include "LocalAccessible-inl.h" +#include "Relation.h" +#include "States.h" +#include "TextUpdater.h" +#include "mozilla/a11y/Role.h" #include "nsAccUtils.h" #include "nsCoreUtils.h" #include "nsTextEquivUtils.h" -#include "Relation.h" -#include "mozilla/a11y/Role.h" -#include "States.h" -#include "TextUpdater.h" #ifdef A11Y_LOG # include "Logging.h" diff --git a/accessible/xul/XULFormControlAccessible.cpp b/accessible/xul/XULFormControlAccessible.cpp index a538ed652c71..b58fd97ff112 100644 --- a/accessible/xul/XULFormControlAccessible.cpp +++ b/accessible/xul/XULFormControlAccessible.cpp @@ -4,16 +4,16 @@ #include "XULFormControlAccessible.h" -#include "LocalAccessible-inl.h" -#include "HTMLFormControlAccessible.h" -#include "nsAccUtils.h" #include "DocAccessible.h" +#include "HTMLFormControlAccessible.h" +#include "LocalAccessible-inl.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" #include "TreeWalker.h" #include "XULMenuAccessible.h" - +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/Element.h" +#include "nsAccUtils.h" #include "nsIContentInlines.h" #include "nsIDOMXULButtonElement.h" #include "nsIDOMXULMenuListElement.h" @@ -22,7 +22,6 @@ #include "nsIFrame.h" #include "nsMenuPopupFrame.h" #include "nsNameSpaceManager.h" -#include "mozilla/dom/Element.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULListboxAccessible.cpp b/accessible/xul/XULListboxAccessible.cpp index f9bd11ed6f97..59122f9131c1 100644 --- a/accessible/xul/XULListboxAccessible.cpp +++ b/accessible/xul/XULListboxAccessible.cpp @@ -4,19 +4,18 @@ #include "XULListboxAccessible.h" -#include "LocalAccessible-inl.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" #include "DocAccessible.h" -#include "mozilla/a11y/Role.h" +#include "LocalAccessible-inl.h" #include "States.h" - +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/NodeList.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" #include "nsComponentManagerUtils.h" #include "nsIAutoCompletePopup.h" #include "nsIDOMXULMenuListElement.h" #include "nsIDOMXULMultSelectCntrlEl.h" #include "nsIDOMXULSelectCntrlItemEl.h" -#include "mozilla/dom/NodeList.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULListboxAccessible.h b/accessible/xul/XULListboxAccessible.h index ac611e6a8007..4838b30b2c5e 100644 --- a/accessible/xul/XULListboxAccessible.h +++ b/accessible/xul/XULListboxAccessible.h @@ -6,9 +6,9 @@ #define mozilla_a11y_XULListboxAccessible_h_ #include "BaseAccessibles.h" -#include "mozilla/a11y/TableAccessible.h" #include "XULMenuAccessible.h" #include "XULSelectControlAccessible.h" +#include "mozilla/a11y/TableAccessible.h" namespace mozilla { namespace a11y { diff --git a/accessible/xul/XULMenuAccessible.cpp b/accessible/xul/XULMenuAccessible.cpp index e727f35abe6b..29706698c5b9 100644 --- a/accessible/xul/XULMenuAccessible.cpp +++ b/accessible/xul/XULMenuAccessible.cpp @@ -4,32 +4,30 @@ #include "XULMenuAccessible.h" +#include "DocAccessible.h" #include "LocalAccessible-inl.h" +#include "States.h" +#include "XULFormControlAccessible.h" #include "XULMenuBarElement.h" #include "XULMenuParentElement.h" #include "XULPopupElement.h" #include "mozilla/Assertions.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" -#include "DocAccessible.h" +#include "mozilla/LookAndFeel.h" +#include "mozilla/Preferences.h" #include "mozilla/a11y/Role.h" -#include "States.h" -#include "XULFormControlAccessible.h" - +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/dom/KeyboardEventBinding.h" +#include "mozilla/dom/XULButtonElement.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsIContent.h" #include "nsIContentInlines.h" #include "nsIDOMXULContainerElement.h" #include "nsIDOMXULSelectCntrlEl.h" #include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIContent.h" #include "nsMenuPopupFrame.h" -#include "mozilla/Preferences.h" -#include "mozilla/LookAndFeel.h" -#include "mozilla/dom/Document.h" -#include "mozilla/dom/Element.h" -#include "mozilla/dom/XULButtonElement.h" -#include "mozilla/dom/KeyboardEventBinding.h" - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/xul/XULSelectControlAccessible.cpp b/accessible/xul/XULSelectControlAccessible.cpp index 6ff1d20528ab..0f5d91693321 100644 --- a/accessible/xul/XULSelectControlAccessible.cpp +++ b/accessible/xul/XULSelectControlAccessible.cpp @@ -4,14 +4,12 @@ #include "XULSelectControlAccessible.h" -#include "nsAccessibilityService.h" #include "DocAccessible.h" - -#include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIDOMXULMultSelectCntrlEl.h" - #include "mozilla/dom/Element.h" #include "mozilla/dom/KeyboardEventBinding.h" +#include "nsAccessibilityService.h" +#include "nsIDOMXULMultSelectCntrlEl.h" +#include "nsIDOMXULSelectCntrlItemEl.h" using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/xul/XULTabAccessible.cpp b/accessible/xul/XULTabAccessible.cpp index 44a3308b8194..f7851d9427a6 100644 --- a/accessible/xul/XULTabAccessible.cpp +++ b/accessible/xul/XULTabAccessible.cpp @@ -5,18 +5,17 @@ #include "XULTabAccessible.h" #include "ARIAMap.h" -#include "nsAccUtils.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" +#include "mozilla/a11y/Role.h" +#include "nsAccUtils.h" // NOTE: alphabetically ordered -#include "mozilla/dom/Document.h" -#include "nsIDOMXULSelectCntrlItemEl.h" -#include "nsIDOMXULRelatedElement.h" -#include "nsXULElement.h" - #include "mozilla/dom/BindingDeclarations.h" +#include "mozilla/dom/Document.h" +#include "nsIDOMXULRelatedElement.h" +#include "nsIDOMXULSelectCntrlItemEl.h" +#include "nsXULElement.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULTreeAccessible.cpp b/accessible/xul/XULTreeAccessible.cpp index e512306c1af0..fa3bd1a5598b 100644 --- a/accessible/xul/XULTreeAccessible.cpp +++ b/accessible/xul/XULTreeAccessible.cpp @@ -4,28 +4,27 @@ #include "XULTreeAccessible.h" -#include "LocalAccessible-inl.h" #include "DocAccessible-inl.h" -#include "nsAccCache.h" -#include "nsAccUtils.h" -#include "nsCoreUtils.h" -#include "nsEventShell.h" #include "DocAccessible.h" +#include "LocalAccessible-inl.h" #include "Relation.h" -#include "mozilla/a11y/Role.h" #include "States.h" #include "XULTreeGridAccessible.h" -#include "nsQueryObject.h" - +#include "mozilla/PresShell.h" +#include "mozilla/a11y/Role.h" +#include "mozilla/dom/XULTreeElementBinding.h" +#include "nsAccCache.h" +#include "nsAccUtils.h" #include "nsComponentManagerUtils.h" +#include "nsCoreUtils.h" +#include "nsEventShell.h" #include "nsIAutoCompletePopup.h" #include "nsIDOMXULMenuListElement.h" #include "nsITreeSelection.h" +#include "nsQueryObject.h" #include "nsTreeBodyFrame.h" #include "nsTreeColumns.h" #include "nsTreeUtils.h" -#include "mozilla/PresShell.h" -#include "mozilla/dom/XULTreeElementBinding.h" using namespace mozilla::a11y; diff --git a/accessible/xul/XULTreeAccessible.h b/accessible/xul/XULTreeAccessible.h index 55a842c96e3e..05f8702f1ed8 100644 --- a/accessible/xul/XULTreeAccessible.h +++ b/accessible/xul/XULTreeAccessible.h @@ -5,9 +5,9 @@ #ifndef mozilla_a11y_XULTreeAccessible_h_ #define mozilla_a11y_XULTreeAccessible_h_ -#include "nsITreeView.h" #include "XULListboxAccessible.h" #include "mozilla/dom/XULTreeElement.h" +#include "nsITreeView.h" class nsTreeBodyFrame; class nsTreeColumn; diff --git a/accessible/xul/XULTreeGridAccessible.cpp b/accessible/xul/XULTreeGridAccessible.cpp index cf16fc5fc664..bc6ca09bc9c4 100644 --- a/accessible/xul/XULTreeGridAccessible.cpp +++ b/accessible/xul/XULTreeGridAccessible.cpp @@ -5,26 +5,26 @@ #include "XULTreeGridAccessible.h" #include -#include "AccAttributes.h" -#include "LocalAccessible-inl.h" -#include "nsAccCache.h" -#include "nsAccessibilityService.h" -#include "nsAccUtils.h" -#include "DocAccessible.h" -#include "nsEventShell.h" -#include "Relation.h" -#include "mozilla/a11y/Role.h" -#include "States.h" -#include "nsQueryObject.h" -#include "nsTreeColumns.h" -#include "nsITreeSelection.h" -#include "nsComponentManagerUtils.h" +#include "AccAttributes.h" +#include "DocAccessible.h" +#include "LocalAccessible-inl.h" +#include "Relation.h" +#include "States.h" #include "mozilla/PresShell.h" +#include "mozilla/a11y/Role.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/TreeColumnBinding.h" #include "mozilla/dom/XULTreeElementBinding.h" +#include "nsAccCache.h" +#include "nsAccUtils.h" +#include "nsAccessibilityService.h" +#include "nsComponentManagerUtils.h" +#include "nsEventShell.h" +#include "nsITreeSelection.h" +#include "nsQueryObject.h" +#include "nsTreeColumns.h" using namespace mozilla::a11y; using namespace mozilla; diff --git a/accessible/xul/XULTreeGridAccessible.h b/accessible/xul/XULTreeGridAccessible.h index dbb1a1df05e5..c197031bfd13 100644 --- a/accessible/xul/XULTreeGridAccessible.h +++ b/accessible/xul/XULTreeGridAccessible.h @@ -5,9 +5,9 @@ #ifndef mozilla_a11y_XULTreeGridAccessible_h_ #define mozilla_a11y_XULTreeGridAccessible_h_ +#include "XULTreeAccessible.h" #include "mozilla/a11y/TableAccessible.h" #include "mozilla/a11y/TableCellAccessible.h" -#include "XULTreeAccessible.h" namespace mozilla { namespace a11y {