From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- accessible/mac/mozAccessible.mm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'accessible/mac/mozAccessible.mm') diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm index aa98496511..0609cc7afc 100644 --- a/accessible/mac/mozAccessible.mm +++ b/accessible/mac/mozAccessible.mm @@ -295,7 +295,8 @@ using namespace mozilla::a11y; - (NSString*)moxRole { #define ROLE(geckoRole, stringRole, ariaRole, atkRole, macRole, macSubrole, \ - msaaRole, ia2Role, androidClass, iosIsElement, nameRule) \ + msaaRole, ia2Role, androidClass, iosIsElement, uiaControlType, \ + nameRule) \ case roles::geckoRole: \ return macRole; @@ -366,7 +367,8 @@ using namespace mozilla::a11y; } #define ROLE(geckoRole, stringRole, ariaRole, atkRole, macRole, macSubrole, \ - msaaRole, ia2Role, androidClass, iosIsElement, nameRule) \ + msaaRole, ia2Role, androidClass, iosIsElement, uiaControlType, \ + nameRule) \ case roles::geckoRole: \ if (![macSubrole isEqualToString:NSAccessibilityUnknownSubrole]) { \ return macSubrole; \ @@ -646,6 +648,16 @@ struct RoleDescrComparator { return @"additions text"; } +- (NSString*)moxPlaceholderValue { + // First, check for plaecholder HTML attribute + if (NSString* placeholder = utils::GetAccAttr(self, nsGkAtoms::placeholder)) { + return placeholder; + } + + // If no placeholder HTML attribute, check for the aria version. + return utils::GetAccAttr(self, nsGkAtoms::aria_placeholder); +} + - (id)moxTitleUIElement { MOZ_ASSERT(mGeckoAccessible); -- cgit v1.2.3