From 1fc8f98cd1a8ee5f8f2b19d60e2c8dc1cacd729c Mon Sep 17 00:00:00 2001 From: James Teh Date: Tue, 22 Nov 2022 04:55:11 +0000 Subject: [PATCH] Bug 1778433 part 2: Change references to defunct *AccessibleWrap types to use the corresponding *Accessible classes. r=nlapre These are effectively type aliases on all platforms now and are no longer necessary. Differential Revision: https://phabricator.services.mozilla.com/D162456 --- accessible/base/HTMLMarkupMap.h | 16 ++++++------- accessible/base/XULMap.h | 14 +++++------ accessible/base/nsAccessibilityService.cpp | 24 +++++++++---------- accessible/html/HTMLImageMapAccessible.cpp | 2 +- accessible/html/HTMLImageMapAccessible.h | 7 +++--- accessible/windows/ia2/ia2AccessibleImage.cpp | 2 +- accessible/xul/XULElementAccessibles.cpp | 2 +- accessible/xul/XULElementAccessibles.h | 6 ++--- accessible/xul/XULTreeGridAccessible.cpp | 4 ++-- 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/accessible/base/HTMLMarkupMap.h b/accessible/base/HTMLMarkupMap.h index eccb01e41d27..d73d51d72509 100644 --- a/accessible/base/HTMLMarkupMap.h +++ b/accessible/base/HTMLMarkupMap.h @@ -351,7 +351,7 @@ MARKUPMAP( [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* { if (!aElement->GetPrimaryFrame() || aElement->GetPrimaryFrame()->AccessibleType() != eHTMLTableType) { - return new ARIAGridAccessibleWrap(aElement, aContext->Document()); + return new ARIAGridAccessible(aElement, aContext->Document()); } // Make sure that our children are proper layout table parts @@ -364,7 +364,7 @@ MARKUPMAP( nsIFrame* childFrame = child->GetPrimaryFrame(); if (childFrame && (!childFrame->IsTableRowGroupFrame() && !childFrame->IsTableRowFrame())) { - return new ARIAGridAccessibleWrap(aElement, aContext->Document()); + return new ARIAGridAccessible(aElement, aContext->Document()); } } } @@ -390,11 +390,11 @@ MARKUPMAP( if (!aContext->IsHTMLTableRow() || !aElement->GetPrimaryFrame() || aElement->GetPrimaryFrame()->AccessibleType() != eHTMLTableCellType) { - return new ARIAGridCellAccessibleWrap(aElement, aContext->Document()); + return new ARIAGridCellAccessible(aElement, aContext->Document()); } if (aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::scope)) { - return new HTMLTableHeaderCellAccessibleWrap(aElement, - aContext->Document()); + return new HTMLTableHeaderCellAccessible(aElement, + aContext->Document()); } } return nullptr; @@ -416,10 +416,10 @@ MARKUPMAP( if (!aContext->IsHTMLTableRow() || !aElement->GetPrimaryFrame() || aElement->GetPrimaryFrame()->AccessibleType() != eHTMLTableCellType) { - return new ARIAGridCellAccessibleWrap(aElement, aContext->Document()); + return new ARIAGridCellAccessible(aElement, aContext->Document()); } - return new HTMLTableHeaderCellAccessibleWrap(aElement, - aContext->Document()); + return new HTMLTableHeaderCellAccessible(aElement, + aContext->Document()); } return nullptr; }, diff --git a/accessible/base/XULMap.h b/accessible/base/XULMap.h index c1d2fcbbff57..cf4eee603b1f 100644 --- a/accessible/base/XULMap.h +++ b/accessible/base/XULMap.h @@ -11,16 +11,16 @@ XULMAP_TYPE(findbar, XULToolbarAccessible) XULMAP_TYPE(groupbox, XULGroupboxAccessible) XULMAP_TYPE(iframe, OuterDocAccessible) XULMAP_TYPE(listheader, XULColumAccessible) -XULMAP_TYPE(menu, XULMenuitemAccessibleWrap) +XULMAP_TYPE(menu, XULMenuitemAccessible) XULMAP_TYPE(menubar, XULMenubarAccessible) -XULMAP_TYPE(menucaption, XULMenuitemAccessibleWrap) -XULMAP_TYPE(menuitem, XULMenuitemAccessibleWrap) +XULMAP_TYPE(menucaption, XULMenuitemAccessible) +XULMAP_TYPE(menuitem, XULMenuitemAccessible) XULMAP_TYPE(menulist, XULComboboxAccessible) XULMAP_TYPE(menuseparator, XULMenuSeparatorAccessible) XULMAP_TYPE(notification, XULAlertAccessible) XULMAP_TYPE(radio, XULRadioButtonAccessible) XULMAP_TYPE(radiogroup, XULRadioGroupAccessible) -XULMAP_TYPE(richlistbox, XULListboxAccessibleWrap) +XULMAP_TYPE(richlistbox, XULListboxAccessible) XULMAP_TYPE(richlistitem, XULListitemAccessible) XULMAP_TYPE(statusbar, XULStatusBarAccessible) XULMAP_TYPE(tab, XULTabAccessible) @@ -64,7 +64,7 @@ XULMAP(image, return nullptr; } - return new ImageAccessibleWrap(aElement, aContext->Document()); + return new ImageAccessible(aElement, aContext->Document()); }) XULMAP(menupopup, [](Element* aElement, LocalAccessible* aContext) { @@ -114,6 +114,6 @@ XULMAP(tree, } // Table or tree table accessible. - return new XULTreeGridAccessibleWrap(aElement, aContext->Document(), - treeFrame); + return new XULTreeGridAccessible(aElement, aContext->Document(), + treeFrame); }) diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index e60946340c7a..0429ed368804 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -8,7 +8,7 @@ // NOTE: alphabetically ordered #include "AccAttributes.h" #include "ApplicationAccessibleWrap.h" -#include "ARIAGridAccessibleWrap.h" +#include "ARIAGridAccessible.h" #include "ARIAMap.h" #include "DocAccessible-inl.h" #include "DocAccessibleChild.h" @@ -19,7 +19,7 @@ #include "HTMLLinkAccessible.h" #include "HTMLListAccessible.h" #include "HTMLSelectAccessible.h" -#include "HTMLTableAccessibleWrap.h" +#include "HTMLTableAccessible.h" #include "HyperTextAccessibleWrap.h" #include "RootAccessible.h" #include "StyleInfo.h" @@ -39,7 +39,7 @@ #endif #include "States.h" #include "Statistics.h" -#include "TextLeafAccessibleWrap.h" +#include "TextLeafAccessible.h" #include "TreeWalker.h" #include "xpcAccessibleApplication.h" @@ -81,10 +81,10 @@ #include "XULComboboxAccessible.h" #include "XULElementAccessibles.h" #include "XULFormControlAccessible.h" -#include "XULListboxAccessibleWrap.h" -#include "XULMenuAccessibleWrap.h" +#include "XULListboxAccessible.h" +#include "XULMenuAccessible.h" #include "XULTabAccessible.h" -#include "XULTreeGridAccessibleWrap.h" +#include "XULTreeGridAccessible.h" using namespace mozilla; using namespace mozilla::a11y; @@ -1108,7 +1108,7 @@ LocalAccessible* nsAccessibilityService::CreateAccessible( if (isARIATablePart && (!newAcc || newAcc->IsGenericHyperText())) { if ((roleMapEntry->accTypes & eTableCell)) { if (aContext->IsTableRow()) { - newAcc = new ARIAGridCellAccessibleWrap(content, document); + newAcc = new ARIAGridCellAccessible(content, document); } } else if (roleMapEntry->IsOfType(eTableRow)) { @@ -1124,7 +1124,7 @@ LocalAccessible* nsAccessibilityService::CreateAccessible( } } else if (roleMapEntry->IsOfType(eTable)) { - newAcc = new ARIAGridAccessibleWrap(content, document); + newAcc = new ARIAGridAccessible(content, document); } } @@ -1482,7 +1482,7 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame, break; case eHTMLTableType: if (aContent->IsHTMLElement(nsGkAtoms::table)) { - newAcc = new HTMLTableAccessibleWrap(aContent, document); + newAcc = new HTMLTableAccessible(aContent, document); } else { newAcc = new HyperTextAccessibleWrap(aContent, document); } @@ -1494,7 +1494,7 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame, // Otherwise create a generic text accessible to avoid text jamming // when reading by AT. if (aContext->IsHTMLTableRow() || aContext->IsHTMLTable()) { - newAcc = new HTMLTableCellAccessibleWrap(aContent, document); + newAcc = new HTMLTableCellAccessible(aContent, document); } else { newAcc = new HyperTextAccessibleWrap(aContent, document); } @@ -1551,14 +1551,14 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame, case eImageType: if (aContent->IsElement() && ShouldCreateImgAccessible(aContent->AsElement(), document)) { - newAcc = new ImageAccessibleWrap(aContent, document); + newAcc = new ImageAccessible(aContent, document); } break; case eOuterDocType: newAcc = new OuterDocAccessible(aContent, document); break; case eTextLeafType: - newAcc = new TextLeafAccessibleWrap(aContent, document); + newAcc = new TextLeafAccessible(aContent, document); break; default: MOZ_ASSERT(false); diff --git a/accessible/html/HTMLImageMapAccessible.cpp b/accessible/html/HTMLImageMapAccessible.cpp index 313164c3e50c..792524449f2c 100644 --- a/accessible/html/HTMLImageMapAccessible.cpp +++ b/accessible/html/HTMLImageMapAccessible.cpp @@ -26,7 +26,7 @@ using namespace mozilla::a11y; HTMLImageMapAccessible::HTMLImageMapAccessible(nsIContent* aContent, DocAccessible* aDoc) - : ImageAccessibleWrap(aContent, aDoc) { + : ImageAccessible(aContent, aDoc) { mType = eImageMapType; UpdateChildAreas(false); diff --git a/accessible/html/HTMLImageMapAccessible.h b/accessible/html/HTMLImageMapAccessible.h index cbe7fdc4b361..61b1d6fcb8b7 100644 --- a/accessible/html/HTMLImageMapAccessible.h +++ b/accessible/html/HTMLImageMapAccessible.h @@ -7,7 +7,7 @@ #define mozilla_a11y_HTMLImageMapAccessible_h__ #include "HTMLLinkAccessible.h" -#include "ImageAccessibleWrap.h" +#include "ImageAccessible.h" namespace mozilla { namespace a11y { @@ -15,13 +15,12 @@ namespace a11y { /** * Used for HTML image maps. */ -class HTMLImageMapAccessible final : public ImageAccessibleWrap { +class HTMLImageMapAccessible final : public ImageAccessible { public: HTMLImageMapAccessible(nsIContent* aContent, DocAccessible* aDoc); // nsISupports and cycle collector - NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLImageMapAccessible, - ImageAccessibleWrap) + NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLImageMapAccessible, ImageAccessible) // LocalAccessible virtual a11y::role NativeRole() const override; diff --git a/accessible/windows/ia2/ia2AccessibleImage.cpp b/accessible/windows/ia2/ia2AccessibleImage.cpp index 39c575049226..529269b56644 100644 --- a/accessible/windows/ia2/ia2AccessibleImage.cpp +++ b/accessible/windows/ia2/ia2AccessibleImage.cpp @@ -9,7 +9,7 @@ #include "AccessibleImage_i.c" -#include "ImageAccessibleWrap.h" +#include "ImageAccessible.h" #include "IUnknownImpl.h" #include "nsIAccessibleTypes.h" diff --git a/accessible/xul/XULElementAccessibles.cpp b/accessible/xul/XULElementAccessibles.cpp index 7fa5d4e49099..247891caccc5 100644 --- a/accessible/xul/XULElementAccessibles.cpp +++ b/accessible/xul/XULElementAccessibles.cpp @@ -124,7 +124,7 @@ void XULLabelAccessible::UpdateLabelValue(const nsString& aValue) { role XULLabelTextLeafAccessible::NativeRole() const { return roles::TEXT_LEAF; } uint64_t XULLabelTextLeafAccessible::NativeState() const { - return TextLeafAccessibleWrap::NativeState() | states::READONLY; + return TextLeafAccessible::NativeState() | states::READONLY; } //////////////////////////////////////////////////////////////////////////////// diff --git a/accessible/xul/XULElementAccessibles.h b/accessible/xul/XULElementAccessibles.h index 22045b6d68c3..c45f7c4bf325 100644 --- a/accessible/xul/XULElementAccessibles.h +++ b/accessible/xul/XULElementAccessibles.h @@ -7,7 +7,7 @@ #define mozilla_a11y_XULElementAccessibles_h__ #include "HyperTextAccessibleWrap.h" -#include "TextLeafAccessibleWrap.h" +#include "TextLeafAccessible.h" namespace mozilla { namespace a11y { @@ -47,10 +47,10 @@ inline XULLabelAccessible* LocalAccessible::AsXULLabel() { * Used to implement text interface on XUL label accessible in case when text * is provided by @value attribute (no underlying text frame). */ -class XULLabelTextLeafAccessible final : public TextLeafAccessibleWrap { +class XULLabelTextLeafAccessible final : public TextLeafAccessible { public: XULLabelTextLeafAccessible(nsIContent* aContent, DocAccessible* aDoc) - : TextLeafAccessibleWrap(aContent, aDoc) { + : TextLeafAccessible(aContent, aDoc) { mStateFlags |= eSharedNode; } diff --git a/accessible/xul/XULTreeGridAccessible.cpp b/accessible/xul/XULTreeGridAccessible.cpp index af2d276ddb53..783f98e7c30a 100644 --- a/accessible/xul/XULTreeGridAccessible.cpp +++ b/accessible/xul/XULTreeGridAccessible.cpp @@ -3,7 +3,7 @@ * 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 "XULTreeGridAccessibleWrap.h" +#include "XULTreeGridAccessible.h" #include "AccAttributes.h" #include "LocalAccessible-inl.h" @@ -307,7 +307,7 @@ XULTreeGridCellAccessible* XULTreeGridRowAccessible::GetCellAccessible( XULTreeGridCellAccessible* cachedCell = mAccessibleCache.GetWeak(key); if (cachedCell) return cachedCell; - RefPtr cell = new XULTreeGridCellAccessibleWrap( + RefPtr cell = new XULTreeGridCellAccessible( mContent, mDoc, const_cast(this), mTree, mTreeView, mRow, aColumn); mAccessibleCache.InsertOrUpdate(key, RefPtr{cell});