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

content/browser/accessibility/browser_accessibility_manager_android.cc

 // Copyright 2013 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 "content/browser/accessibility/browser_accessibility_manager_android.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 171 matching lines @@
   DeleteAutofillPopupProxy();
 
   Java_BrowserAccessibilityManager_onNativeObjectDestroyed(
       env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 // static
 ui::AXTreeUpdate
     BrowserAccessibilityManagerAndroid::GetEmptyDocument() {
   ui::AXNodeData empty_document;
+  empty_document.ClearBitfields();
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  empty_document.state = 1 << ui::AX_STATE_READ_ONLY;
+  empty_document.AddState(ui::AX_STATE_READ_ONLY);
 
   ui::AXTreeUpdate update;
   update.root_id = empty_document.id;
   update.nodes.push_back(empty_document);
   return update;
 }
 
 void BrowserAccessibilityManagerAndroid::SetContentViewCore(
     ScopedJavaLocalRef<jobject> content_view_core) {
   if (content_view_core.is_null())
@@ skipping 777 matching lines @@
   BrowserAccessibility* current_focus = GetFocus();
   if (current_focus == nullptr) {
     return;
   }
 
   DeleteAutofillPopupProxy();
 
   g_autofill_popup_proxy_node = BrowserAccessibility::Create();
   g_autofill_popup_proxy_node_ax_node = new ui::AXNode(nullptr, -1, -1);
   ui::AXNodeData ax_node_data;
+  ax_node_data.ClearBitfields();
   ax_node_data.role = ui::AX_ROLE_MENU;
   ax_node_data.SetName("Autofill");
-  ax_node_data.state = 1 << ui::AX_STATE_READ_ONLY;
-  ax_node_data.state |= 1 << ui::AX_STATE_FOCUSABLE;
-  ax_node_data.state |= 1 << ui::AX_STATE_SELECTABLE;
+  ax_node_data.AddState(ui::AX_STATE_READ_ONLY);
+  ax_node_data.AddState(ui::AX_STATE_FOCUSABLE);
+  ax_node_data.AddState(ui::AX_STATE_SELECTABLE);
   g_autofill_popup_proxy_node_ax_node->SetData(ax_node_data);
   g_autofill_popup_proxy_node->Init(this, g_autofill_popup_proxy_node_ax_node);
 
   g_element_hosting_autofill_popup_unique_id = current_focus->unique_id();
 }
 
 void BrowserAccessibilityManagerAndroid::OnAutofillPopupDismissed(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   g_element_hosting_autofill_popup_unique_id = -1;
@@ skipping 73 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content