A11y: Add/refactor methods for manipulating bitfields on AXNodeData.

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h"
 
 #include <string>
 
 #include "chrome/browser/extensions/api/automation_internal/automation_event_router.h"
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
@@ skipping 147 matching lines @@
   std::string text;
   GetStringProperty(node, arc::mojom::AccessibilityStringProperty::TEXT, &text);
   if (!text.empty())
     out_data->role = ui::AX_ROLE_STATIC_TEXT;
   else
     out_data->role = ui::AX_ROLE_DIV;
 }
 
 void PopulateAXState(arc::mojom::AccessibilityNodeInfoData* node,
                      ui::AXNodeData* out_data) {
-  out_data->state = 0;
-
 #define MAP_STATE(android_boolean_property, chrome_state) \
   if (GetBooleanProperty(node, android_boolean_property)) \
-    out_data->AddStateFlag(chrome_state);
+    out_data->AddState(chrome_state);
 
   using AXBooleanProperty = arc::mojom::AccessibilityBooleanProperty;
 
   // These mappings were taken from accessibility utils (Android -> Chrome) and
   // BrowserAccessibilityAndroid. They do not completely match the above two
   // sources.
   // The FOCUSABLE state is not mapped because Android places focusability on
   // many ancestor nodes.
   MAP_STATE(AXBooleanProperty::EDITABLE, ui::AX_STATE_EDITABLE);
   MAP_STATE(AXBooleanProperty::MULTI_LINE, ui::AX_STATE_MULTILINE);
   MAP_STATE(AXBooleanProperty::PASSWORD, ui::AX_STATE_PROTECTED);
   MAP_STATE(AXBooleanProperty::SELECTED, ui::AX_STATE_SELECTED);
 
 #undef MAP_STATE
 
   if (GetBooleanProperty(node, AXBooleanProperty::CHECKABLE)) {
     const bool is_checked =
         GetBooleanProperty(node, AXBooleanProperty::CHECKED);
     const ui::AXCheckedState checked_state =
         is_checked ? ui::AX_CHECKED_STATE_TRUE : ui::AX_CHECKED_STATE_FALSE;
     out_data->AddIntAttribute(ui::AX_ATTR_CHECKED_STATE, checked_state);
   }
 
   if (!GetBooleanProperty(node, AXBooleanProperty::ENABLED))
-    out_data->AddStateFlag(ui::AX_STATE_DISABLED);
+    out_data->AddState(ui::AX_STATE_DISABLED);
 }
 
 }  // namespace
 
 namespace arc {
 
 AXTreeSourceArc::AXTreeSourceArc(int32_t id)
     : tree_id_(id),
       current_tree_serializer_(new AXTreeArcSerializer(this)),
       root_id_(-1),
@@ skipping 157 matching lines @@
   parent_map_.clear();
   current_tree_serializer_.reset(new AXTreeArcSerializer(this));
   root_id_ = -1;
   focused_node_id_ = -1;
   extensions::AutomationEventRouter* router =
       extensions::AutomationEventRouter::GetInstance();
   router->DispatchTreeDestroyedEvent(tree_id_, nullptr);
 }
 
 }  // namespace arc