ax_mac_merge: merge AXAccessKey and AXAutocompleteValue implementations

Change-Id: Ib2a483f5e9a8d8f75ebfef8303fde8028b2c8cea
Bug: 1237915
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3223163
Reviewed-by: Nektarios Paisios <nektar@chromium.org>
Commit-Queue: Alexander Surkov <asurkov@igalia.com>
Cr-Commit-Position: refs/heads/main@{#932041}

content/browser/accessibility/browser_accessibility_cocoa.h

@@ -134,7 +134,6 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
 // Internally-used property.
 @property(nonatomic, readonly) NSPoint origin;
 
-@property(nonatomic, readonly) NSString* accessKey;
 @property(nonatomic, readonly) NSNumber* ariaPosInSet;
 @property(nonatomic, readonly) NSNumber* ariaSetSize;
 @property(nonatomic, readonly) NSArray* children;

content/browser/accessibility/browser_accessibility_cocoa.mm

@@ -68,9 +68,6 @@
 NSString* const NSAccessibilityARIARowCountAttribute = @"AXARIARowCount";
 NSString* const NSAccessibilityARIARowIndexAttribute = @"AXARIARowIndex";
 NSString* const NSAccessibilityARIASetSizeAttribute = @"AXARIASetSize";
-NSString* const NSAccessibilityAccessKeyAttribute = @"AXAccessKey";
-NSString* const NSAccessibilityAutocompleteValueAttribute =
-    @"AXAutocompleteValue";
 NSString* const NSAccessibilityBlockQuoteLevelAttribute = @"AXBlockQuoteLevel";
 NSString* const NSAccessibilityDetailsElementsAttribute = @"AXDetailsElements";
 NSString* const NSAccessibilityDOMClassList = @"AXDOMClassList";
@@ -807,8 +804,6 @@ + (void)initialize {
       {NSAccessibilityARIARowCountAttribute, @"ariaRowCount"},
       {NSAccessibilityARIARowIndexAttribute, @"ariaRowIndex"},
       {NSAccessibilityARIASetSizeAttribute, @"ariaSetSize"},
-      {NSAccessibilityAccessKeyAttribute, @"accessKey"},
-      {NSAccessibilityAutocompleteValueAttribute, @"autocompleteValue"},
       {NSAccessibilityBlockQuoteLevelAttribute, @"blockQuoteLevel"},
       {NSAccessibilityChildrenAttribute, @"children"},
       {NSAccessibilityIdentifierChromeAttribute, @"internalId"},
@@ -925,13 +920,6 @@ - (void)detach {
   [super detach];
 }
 
-- (NSString*)accessKey {
-  if (![self instanceActive])
-    return nil;
-  return NSStringForStringAttribute(_owner,
-                                    ax::mojom::StringAttribute::kAccessKey);
-}
-
 - (NSNumber*)ariaColumnCount {
   if (![self instanceActive])
     return nil;
@@ -986,13 +974,6 @@ - (NSNumber*)ariaSetSize {
   return @(*setSize);
 }
 
-- (NSString*)autocompleteValue {
-  if (![self instanceActive])
-    return nil;
-  return NSStringForStringAttribute(_owner,
-                                    ax::mojom::StringAttribute::kAutoComplete);
-}
-
 - (id)blockQuoteLevel {
   if (![self instanceActive])
     return nil;
@@ -3624,7 +3605,6 @@ - (NSArray*)accessibilityAttributeNames {
       _owner->HasIntAttribute(ax::mojom::IntAttribute::kInvalidState) ||
       _owner->HasState(ax::mojom::State::kFocusable)) {
     [ret addObjectsFromArray:@[
-      NSAccessibilityAccessKeyAttribute,
       NSAccessibilityInvalidAttribute,
       @"AXRequired",
     ]];
@@ -3655,8 +3635,6 @@ - (NSArray*)accessibilityAttributeNames {
            .empty()) {
     [ret addObject:NSAccessibilityDetailsElementsAttribute];
   }
-  if (_owner->HasStringAttribute(ax::mojom::StringAttribute::kAutoComplete))
-    [ret addObject:NSAccessibilityAutocompleteValueAttribute];
 
   if ([self shouldExposeTitleUIElement])
     [ret addObject:NSAccessibilityTitleUIElementAttribute];

content/browser/accessibility/dump_accessibility_scripts_browsertest.cc

@@ -177,6 +177,10 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, AXPressButton) {
   RunMacActionTest(FILE_PATH_LITERAL("ax-press-button.html"));
 }
 
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, AXAccessKey) {
+  RunMacAttributesTest(FILE_PATH_LITERAL("ax-access-key.html"));
+}
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, AXARIAAtomic) {
   RunMacAttributesTest(FILE_PATH_LITERAL("ax-aria-atomic.html"));
 }
@@ -197,6 +201,10 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, AXARIARelevant) {
   RunMacAttributesTest(FILE_PATH_LITERAL("ax-aria-relevant.html"));
 }
 
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, AXAutocompleteValue) {
+  RunMacAttributesTest(FILE_PATH_LITERAL("ax-autocomplete-value.html"));
+}
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityScriptTest, SelectAllTextarea) {
   RunMacSelectionTest(FILE_PATH_LITERAL("selectall-textarea.html"));
 }

content/test/data/accessibility/mac/attributes/ax-access-key-expected-mac.txt

@@ -0,0 +1,4 @@
+focusable.AXAccessKey='s'
+restriction.AXAccessKey='s'
+invalid.AXAccessKey='s'
+not_applicable.AXAccessKey=ERROR:FAILED_TO_PARSE

content/test/data/accessibility/mac/attributes/ax-access-key.html

@@ -0,0 +1,12 @@
+<!--
+@MAC-SCRIPT:
+  focusable.AXAccessKey
+  restriction.AXAccessKey
+  invalid.AXAccessKey
+  not_applicable.AXAccessKey
+-->
+<!DOCTYPE html>
+<input id="focusable" accesskey="s">
+<input id="restriction" readonly accesskey="s">
+<div id="invalid" aria-invalid="true" accesskey="s">
+<div id="not_applicable" accesskey="s">

content/test/data/accessibility/mac/attributes/ax-autocomplete-value-expected-mac.txt

@@ -0,0 +1,2 @@
+autocomplete.AXAutocompleteValue='list'
+not_applicable.AXAutocompleteValue=ERROR:FAILED_TO_PARSE

content/test/data/accessibility/mac/attributes/ax-autocomplete-value.html

@@ -0,0 +1,8 @@
+<!--
+@MAC-SCRIPT:
+  autocomplete.AXAutocompleteValue
+  not_applicable.AXAutocompleteValue
+-->
+<!DOCTYPE html>
+<input id="autocomplete" aria-autocomplete="list">
+<div id="not_applicable"></div>

ui/accessibility/platform/ax_platform_node_cocoa.mm

@@ -26,11 +26,14 @@
 namespace {
 
 // Private WebKit accessibility attributes.
+NSString* const NSAccessibilityAccessKeyAttribute = @"AXAccessKey";
 NSString* const NSAccessibilityARIAAtomicAttribute = @"AXARIAAtomic";
 NSString* const NSAccessibilityARIABusyAttribute = @"AXARIABusy";
 NSString* const NSAccessibilityARIACurrentAttribute = @"AXARIACurrent";
 NSString* const NSAccessibilityARIALiveAttribute = @"AXARIALive";
 NSString* const NSAccessibilityARIARelevantAttribute = @"AXARIARelevant";
+NSString* const NSAccessibilityAutocompleteValueAttribute =
+    @"AXAutocompleteValue";
 
 // Same length as web content/WebKit.
 static int kLiveRegionDebounceMillis = 20;
@@ -663,6 +666,18 @@ - (NSArray*)accessibilityAttributeNames {
   if (_node->HasIntAttribute(ax::mojom::IntAttribute::kAriaCurrentState))
     [axAttributes addObject:NSAccessibilityARIACurrentAttribute];
 
+  // Focusable element or a control element.
+  if (_node->HasIntAttribute(ax::mojom::IntAttribute::kRestriction) ||
+      _node->HasIntAttribute(ax::mojom::IntAttribute::kInvalidState) ||
+      _node->HasState(ax::mojom::State::kFocusable)) {
+    [axAttributes addObjectsFromArray:@[
+      NSAccessibilityAccessKeyAttribute,
+    ]];
+  }
+
+  if (_node->HasStringAttribute(ax::mojom::StringAttribute::kAutoComplete))
+    [axAttributes addObject:NSAccessibilityAutocompleteValueAttribute];
+
   return axAttributes.autorelease();
 }
 
@@ -714,6 +729,13 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
 // NSAccessibility attributes. Order them according to
 // NSAccessibilityConstants.h, or see https://crbug.com/678898.
 
+- (NSString*)AXAccessKey {
+  if (![self instanceActive])
+    return nil;
+
+  return [self getStringAttribute:ax::mojom::StringAttribute::kAccessKey];
+}
+
 - (NSNumber*)AXARIAAtomic {
   if (![self instanceActive])
     return nil;
@@ -775,6 +797,13 @@ - (NSString*)AXARIARelevant {
   return [self getStringAttribute:ax::mojom::StringAttribute::kLiveRelevant];
 }
 
+- (NSString*)AXAutocompleteValue {
+  if (![self instanceActive])
+    return nil;
+
+  return [self getStringAttribute:ax::mojom::StringAttribute::kAutoComplete];
+}
+
 - (NSString*)AXRole {
   if (!_node)
     return nil;