Clean up ARC a11y standard action lookup.

This CL adds HasStandardAction in arc accessibility util.

Bug: none.
Test: unit_test
Change-Id: I1380f1f89647bbe2b39dedc3da0f28ffb3fd90b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2091098Reviewed-by: Sara Kato <sarakato@chromium.org>
Commit-Queue: Hiroki Sato <hirokisato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748070}

chrome/browser/chromeos/arc/accessibility/accessibility_node_info_data_wrapper.cc

@@ -455,30 +455,21 @@ void AccessibilityNodeInfoDataWrapper::Serialize(
         ToLiveStatusString(container_live_status_));
   }
 
-  std::vector<int32_t> standard_action_ids;
-  if (GetProperty(AXIntListProperty::STANDARD_ACTION_IDS,
-                  &standard_action_ids)) {
-    for (size_t i = 0; i < standard_action_ids.size(); ++i) {
-      switch (static_cast<AXActionType>(standard_action_ids[i])) {
-        case AXActionType::SCROLL_BACKWARD:
-          out_data->AddAction(ax::mojom::Action::kScrollBackward);
-          break;
-        case AXActionType::SCROLL_FORWARD:
-          out_data->AddAction(ax::mojom::Action::kScrollForward);
-          break;
-        case AXActionType::EXPAND:
-          out_data->AddAction(ax::mojom::Action::kExpand);
-          out_data->AddState(ax::mojom::State::kCollapsed);
-          break;
-        case AXActionType::COLLAPSE:
-          out_data->AddAction(ax::mojom::Action::kCollapse);
-          out_data->AddState(ax::mojom::State::kExpanded);
-          break;
-        default:
-          // unmapped
-          break;
-      }
-    }
+  // Standard actions.
+  if (HasStandardAction(AXActionType::SCROLL_BACKWARD))
+    out_data->AddAction(ax::mojom::Action::kScrollBackward);
+
+  if (HasStandardAction(AXActionType::SCROLL_FORWARD))
+    out_data->AddAction(ax::mojom::Action::kScrollForward);
+
+  if (HasStandardAction(AXActionType::EXPAND)) {
+    out_data->AddAction(ax::mojom::Action::kExpand);
+    out_data->AddState(ax::mojom::State::kCollapsed);
+  }
+
+  if (HasStandardAction(AXActionType::COLLAPSE)) {
+    out_data->AddAction(ax::mojom::Action::kCollapse);
+    out_data->AddState(ax::mojom::State::kExpanded);
   }
 
   // Custom actions.
@@ -545,6 +536,11 @@ bool AccessibilityNodeInfoDataWrapper::GetProperty(
   return arc::GetProperty(node_ptr_->string_list_properties, prop, out_value);
 }
 
+bool AccessibilityNodeInfoDataWrapper::HasStandardAction(
+    AXActionType action) const {
+  return arc::HasStandardAction(node_ptr_, action);
+}
+
 bool AccessibilityNodeInfoDataWrapper::HasCoveringSpan(
     AXStringProperty prop,
     mojom::SpanType span_type) const {

chrome/browser/chromeos/arc/accessibility/accessibility_node_info_data_wrapper.h

@@ -57,6 +57,8 @@ class AccessibilityNodeInfoDataWrapper : public AccessibilityInfoDataWrapper {
   bool GetProperty(mojom::AccessibilityStringListProperty prop,
                    std::vector<std::string>* out_value) const;
 
+  bool HasStandardAction(mojom::AccessibilityActionType action) const;
+
   bool HasCoveringSpan(mojom::AccessibilityStringProperty prop,
                        mojom::SpanType span_type) const;
 

chrome/browser/chromeos/arc/accessibility/arc_accessibility_util.cc

@@ -145,21 +145,9 @@ bool IsImportantInAndroid(AXNodeInfoData* node) {
   // WebView and its child nodes do not have accessibility importance set.
   // This logic can be removed once the change in crrev/c/1890402 landed
   // in all ARC containers.
-  std::vector<int32_t> standard_action_ids;
-  if (GetProperty(node->int_list_properties,
-                  AXIntListProperty::STANDARD_ACTION_IDS,
-                  &standard_action_ids)) {
-    for (const int32_t id : standard_action_ids) {
-      switch (static_cast<AXActionType>(id)) {
-        case AXActionType::NEXT_HTML_ELEMENT:
-        case AXActionType::PREVIOUS_HTML_ELEMENT:
-          return true;
-        default:
-          // unused.
-          break;
-      }
-    }
-  }
+  if (HasStandardAction(node, AXActionType::NEXT_HTML_ELEMENT) ||
+      HasStandardAction(node, AXActionType::PREVIOUS_HTML_ELEMENT))
+    return true;
 
   return false;
 }
@@ -180,24 +168,28 @@ bool HasImportantProperty(AXNodeInfoData* node) {
       GetBooleanProperty(node, AXBooleanProperty::SELECTED))
     return true;
 
-  std::vector<int32_t> standard_action_ids;
-  if (GetProperty(node->int_list_properties,
-                  AXIntListProperty::STANDARD_ACTION_IDS,
-                  &standard_action_ids)) {
-    for (const int32_t id : standard_action_ids) {
-      switch (static_cast<AXActionType>(id)) {
-        case AXActionType::CLICK:
-        case AXActionType::FOCUS:
-          return true;
-        default:
-          // unused.
-          break;
-      }
-    }
-  }
+  if (HasStandardAction(node, AXActionType::CLICK) ||
+      HasStandardAction(node, AXActionType::FOCUS))
+    return true;
 
   // TODO(hirokisato) Also check LABELED_BY and ui::IsControl(role)
   return false;
 }
 
+bool HasStandardAction(AXNodeInfoData* node, AXActionType action) {
+  if (!node || !node->int_list_properties)
+    return false;
+
+  auto itr =
+      node->int_list_properties->find(AXIntListProperty::STANDARD_ACTION_IDS);
+  if (itr == node->int_list_properties->end())
+    return false;
+
+  for (const auto supported_action : itr->second) {
+    if (static_cast<AXActionType>(supported_action) == action)
+      return true;
+  }
+  return false;
+}
+
 }  // namespace arc

chrome/browser/chromeos/arc/accessibility/arc_accessibility_util.h

@@ -27,6 +27,9 @@ bool IsImportantInAndroid(mojom::AccessibilityNodeInfoData* node);
 
 bool HasImportantProperty(mojom::AccessibilityNodeInfoData* node);
 
+bool HasStandardAction(mojom::AccessibilityNodeInfoData* node,
+                       mojom::AccessibilityActionType action);
+
 template <class DataType, class PropType>
 bool GetBooleanProperty(DataType* node, PropType prop) {
   if (!node->boolean_properties)