--- a/accessible/base/nsAccessibilityService.cpp
+++ b/accessible/base/nsAccessibilityService.cpp
@@ -299,36 +299,36 @@ New_HTMLTableHeaderCellIfScope(nsIConten
* Cached value of the PREF_ACCESSIBILITY_FORCE_DISABLED preference.
*/
static int32_t sPlatformDisabledState = 0;
////////////////////////////////////////////////////////////////////////////////
// Markup maps array.
#define Attr(name, value) \
- { &nsGkAtoms::name, &nsGkAtoms::value }
+ { nsGkAtoms::name, nsGkAtoms::value }
#define AttrFromDOM(name, DOMAttrName) \
- { &nsGkAtoms::name, nullptr, &nsGkAtoms::DOMAttrName }
+ { nsGkAtoms::name, nullptr, nsGkAtoms::DOMAttrName }
#define AttrFromDOMIf(name, DOMAttrName, DOMAttrValue) \
- { &nsGkAtoms::name, nullptr, &nsGkAtoms::DOMAttrName, &nsGkAtoms::DOMAttrValue }
+ { nsGkAtoms::name, nullptr, nsGkAtoms::DOMAttrName, nsGkAtoms::DOMAttrValue }
#define MARKUPMAP(atom, new_func, r, ... ) \
- { &nsGkAtoms::atom, new_func, static_cast<a11y::role>(r), { __VA_ARGS__ } },
+ { nsGkAtoms::atom, new_func, static_cast<a11y::role>(r), { __VA_ARGS__ } },
static const HTMLMarkupMapInfo sHTMLMarkupMapList[] = {
#include "MarkupMap.h"
};
#undef MARKUPMAP
#ifdef MOZ_XUL
#define XULMAP(atom, ...) \
- { &nsGkAtoms::atom, __VA_ARGS__ },
+ { nsGkAtoms::atom, __VA_ARGS__ },
#define XULMAP_TYPE(atom, new_type) \
XULMAP( \
atom, \
[](nsIContent* aContent, Accessible* aContext) -> Accessible* { \
return new new_type(aContent, aContext->Document()); \
} \
)
@@ -1345,21 +1345,21 @@ nsAccessibilityService::Init()
nsCOMPtr<nsIEventListenerService> eventListenerService =
do_GetService("@mozilla.org/eventlistenerservice;1");
if (!eventListenerService)
return false;
eventListenerService->AddListenerChangeListener(this);
for (uint32_t i = 0; i < ArrayLength(sHTMLMarkupMapList); i++)
- mHTMLMarkupMap.Put(*sHTMLMarkupMapList[i].tag, &sHTMLMarkupMapList[i]);
+ mHTMLMarkupMap.Put(sHTMLMarkupMapList[i].tag, &sHTMLMarkupMapList[i]);
#ifdef MOZ_XUL
for (uint32_t i = 0; i < ArrayLength(sXULMarkupMapList); i++)
- mXULMarkupMap.Put(*sXULMarkupMapList[i].tag, &sXULMarkupMapList[i]);
+ mXULMarkupMap.Put(sXULMarkupMapList[i].tag, &sXULMarkupMapList[i]);
#endif
#ifdef A11Y_LOG
logging::CheckEnv();
#endif
gAccessibilityService = this;
NS_ADDREF(gAccessibilityService); // will release in Shutdown()
@@ -1611,37 +1611,37 @@ nsAccessibilityService::MarkupAttributes
const MarkupAttrInfo* info = markupMap->attrs + i;
if (!info->name)
break;
if (info->DOMAttrName) {
if (info->DOMAttrValue) {
if (aContent->IsElement() &&
aContent->AsElement()->AttrValueIs(kNameSpaceID_None,
- *info->DOMAttrName,
- *info->DOMAttrValue,
+ info->DOMAttrName,
+ info->DOMAttrValue,
eCaseMatters)) {
- nsAccUtils::SetAccAttr(aAttributes, *info->name, *info->DOMAttrValue);
+ nsAccUtils::SetAccAttr(aAttributes, info->name, info->DOMAttrValue);
}
continue;
}
nsAutoString value;
if (aContent->IsElement()) {
- aContent->AsElement()->GetAttr(kNameSpaceID_None, *info->DOMAttrName, value);
+ aContent->AsElement()->GetAttr(kNameSpaceID_None, info->DOMAttrName, value);
}
if (!value.IsEmpty())
- nsAccUtils::SetAccAttr(aAttributes, *info->name, value);
+ nsAccUtils::SetAccAttr(aAttributes, info->name, value);
continue;
}
- nsAccUtils::SetAccAttr(aAttributes, *info->name, *info->value);
+ nsAccUtils::SetAccAttr(aAttributes, info->name, info->value);
}
}
Accessible*
nsAccessibilityService::AddNativeRootAccessible(void* aAtkAccessible)
{
#ifdef MOZ_ACCESSIBILITY_ATK
ApplicationAccessible* applicationAcc = ApplicationAcc();