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

ui/accessibility/platform/ax_platform_node_mac.mm

 // Copyright 2014 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.
 
 #import "ui/accessibility/platform/ax_platform_node_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/macros.h"
@@ skipping 273 matching lines @@
   std::string attributeValue;
   if (node_->GetStringAttribute(attribute, &attributeValue))
     return base::SysUTF8ToNSString(attributeValue);
   return nil;
 }
 
 // NSAccessibility informal protocol implementation.
 
 - (BOOL)accessibilityIsIgnored {
   return [[self AXRole] isEqualToString:NSAccessibilityUnknownRole] ||
-         node_->GetData().HasStateFlag(ui::AX_STATE_INVISIBLE);
+         node_->GetData().HasState(ui::AX_STATE_INVISIBLE);
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   for (AXPlatformNodeCocoa* child in [self AXChildren]) {
     if (NSPointInRect(point, child.boundsInScreen))
       return [child accessibilityHitTest:point];
   }
   return NSAccessibilityUnignoredAncestor(self);
 }
 
@@ skipping 69 matching lines @@
   NSString* const kTextfieldAttributes =
       NSAccessibilityPlaceholderValueAttribute;
 
   base::scoped_nsobject<NSMutableArray> axAttributes(
       [[NSMutableArray alloc] init]);
 
   [axAttributes addObjectsFromArray:kAllRoleAttributes];
   switch (node_->GetData().role) {
     case ui::AX_ROLE_TEXT_FIELD:
       [axAttributes addObject:kTextfieldAttributes];
-      if (!ui::AXNodeData::IsFlagSet(node_->GetData().state,
-                                     ui::AX_STATE_PROTECTED)) {
+      if (!node_->GetData().HasState(ui::AX_STATE_PROTECTED))
         [axAttributes addObjectsFromArray:kUnprotectedTextfieldAttributes];
-      }
     // Fallthrough.
     case ui::AX_ROLE_CHECK_BOX:
     case ui::AX_ROLE_COMBO_BOX:
     case ui::AX_ROLE_MENU_ITEM_CHECK_BOX:
     case ui::AX_ROLE_MENU_ITEM_RADIO:
     case ui::AX_ROLE_RADIO_BUTTON:
     case ui::AX_ROLE_SEARCH_BOX:
     case ui::AX_ROLE_SLIDER:
     case ui::AX_ROLE_SLIDER_THUMB:
     case ui::AX_ROLE_TOGGLE_BUTTON:
       [axAttributes addObjectsFromArray:kValueAttributes];
       break;
     // TODO(tapted): Add additional attributes based on role.
     default:
       break;
   }
   return axAttributes.autorelease();
 }
 
 - (BOOL)accessibilityIsAttributeSettable:(NSString*)attributeName {
-  if (node_->GetData().HasStateFlag(ui::AX_STATE_DISABLED))
+  if (node_->GetData().HasState(ui::AX_STATE_DISABLED))
     return NO;
 
   // Allow certain attributes to be written via an accessibility client. A
   // writable attribute will only appear as such if the accessibility element
   // has a value set for that attribute.
   if ([attributeName
           isEqualToString:NSAccessibilitySelectedChildrenAttribute] ||
       [attributeName
           isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute]) {
     return NO;
   }
 
   if ([attributeName isEqualToString:NSAccessibilityValueAttribute]) {
     // NSSecureTextField doesn't allow values to be edited (despite showing up
     // as editable), match its behavior.
-    if (node_->GetData().HasStateFlag(ui::AX_STATE_PROTECTED))
+    if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
       return NO;
     // Since tabs use the Radio Button role on Mac, the standard way to set
     // them is via the value attribute rather than the selected attribute.
     if (node_->GetData().role == ui::AX_ROLE_TAB)
-      return !node_->GetData().HasStateFlag(ui::AX_STATE_SELECTED);
+      return !node_->GetData().HasState(ui::AX_STATE_SELECTED);
   }
 
   if ([attributeName isEqualToString:NSAccessibilityValueAttribute] ||
       [attributeName isEqualToString:NSAccessibilitySelectedTextAttribute] ||
       [attributeName
           isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
-    return !ui::AXNodeData::IsFlagSet(node_->GetData().state,
-                                      ui::AX_STATE_READ_ONLY);
+    return !node_->GetData().HasState(ui::AX_STATE_READ_ONLY);
   }
 
   if ([attributeName isEqualToString:NSAccessibilityFocusedAttribute]) {
-    return ui::AXNodeData::IsFlagSet(node_->GetData().state,
-                                     ui::AX_STATE_FOCUSABLE);
+    return node_->GetData().HasState(ui::AX_STATE_FOCUSABLE);
   }
 
   // TODO(patricialor): Add callbacks for updating the above attributes except
   // NSAccessibilityValueAttribute and return YES.
   return NO;
 }
 
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
   ui::AXActionData data;
 
   // Check for attributes first. Only the |data.action| should be set here - any
   // type-specific information, if needed, should be set below.
   if ([attribute isEqualToString:NSAccessibilityValueAttribute] &&
-      !node_->GetData().HasStateFlag(ui::AX_STATE_PROTECTED)) {
+      !node_->GetData().HasState(ui::AX_STATE_PROTECTED)) {
     data.action = node_->GetData().role == ui::AX_ROLE_TAB
                       ? ui::AX_ACTION_SET_SELECTION
                       : ui::AX_ACTION_SET_VALUE;
   } else if ([attribute isEqualToString:NSAccessibilitySelectedTextAttribute]) {
     data.action = ui::AX_ACTION_REPLACE_SELECTED_TEXT;
   } else if ([attribute
                  isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
     data.action = ui::AX_ACTION_SET_SELECTION;
   } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
     if ([value isKindOfClass:[NSNumber class]]) {
@@ skipping 45 matching lines @@
     default:
       break;
   }
   return NSAccessibilityRoleDescription([self AXRole], [self AXSubrole]);
 }
 
 - (NSString*)AXSubrole {
   ui::AXRole role = node_->GetData().role;
   switch (role) {
     case ui::AX_ROLE_TEXT_FIELD:
-      if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
-                                    ui::AX_STATE_PROTECTED))
+      if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
         return NSAccessibilitySecureTextFieldSubrole;
       break;
     default:
       break;
   }
   return [AXPlatformNodeCocoa nativeSubroleFromAXRole:role];
 }
 
 - (NSString*)AXHelp {
   return [self getStringAttribute:ui::AX_ATTR_DESCRIPTION];
 }
 
 - (id)AXValue {
   if (node_->GetData().role == ui::AX_ROLE_TAB)
     return [self AXSelected];
   return [self getStringAttribute:ui::AX_ATTR_VALUE];
 }
 
 - (NSNumber*)AXEnabled {
-  return @(!ui::AXNodeData::IsFlagSet(node_->GetData().state,
-                                      ui::AX_STATE_DISABLED));
+  return @(!node_->GetData().HasState(ui::AX_STATE_DISABLED));
 }
 
 - (NSNumber*)AXFocused {
-  if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
-                                ui::AX_STATE_FOCUSABLE))
+  if (node_->GetData().HasState(ui::AX_STATE_FOCUSABLE))
     return
         @(node_->GetDelegate()->GetFocus() == node_->GetNativeViewAccessible());
   return @NO;
 }
 
 - (id)AXParent {
   if (!node_)
     return nil;
   return NSAccessibilityUnignoredAncestor(node_->GetParent());
 }
@@ skipping 24 matching lines @@
   return [NSValue valueWithSize:self.boundsInScreen.size];
 }
 
 - (NSString*)AXTitle {
   return [self getStringAttribute:ui::AX_ATTR_NAME];
 }
 
 // Misc attributes.
 
 - (NSNumber*)AXSelected {
-  return @(node_->GetData().HasStateFlag(ui::AX_STATE_SELECTED));
+  return @(node_->GetData().HasState(ui::AX_STATE_SELECTED));
 }
 
 - (NSString*)AXPlaceholderValue {
   return [self getStringAttribute:ui::AX_ATTR_PLACEHOLDER];
 }
 
 // Text-specific attributes.
 
 - (NSString*)AXSelectedText {
-  if (ui::AXNodeData::IsFlagSet(node_->GetData().state, ui::AX_STATE_PROTECTED))
+  if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
     return nil;
 
   NSRange selectedTextRange;
   [[self AXSelectedTextRange] getValue:&selectedTextRange];
   return [[self AXValue] substringWithRange:selectedTextRange];
 }
 
 - (NSValue*)AXSelectedTextRange {
-  if (ui::AXNodeData::IsFlagSet(node_->GetData().state, ui::AX_STATE_PROTECTED))
+  if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
     return nil;
 
   int textDir, start, end;
   node_->GetIntAttribute(ui::AX_ATTR_TEXT_DIRECTION, &textDir);
   node_->GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START, &start);
   node_->GetIntAttribute(ui::AX_ATTR_TEXT_SEL_END, &end);
   // NSRange cannot represent the direction the text was selected in, so make
   // sure the correct selection index is used when creating a new range, taking
   // into account the textfield text direction as well.
   bool isReversed = (textDir == ui::AX_TEXT_DIRECTION_RTL) ||
                     (textDir == ui::AX_TEXT_DIRECTION_BTT);
   int beginSelectionIndex = (end > start && !isReversed) ? start : end;
   return [NSValue valueWithRange:{beginSelectionIndex, abs(end - start)}];
 }
 
 - (NSNumber*)AXNumberOfCharacters {
-  if (ui::AXNodeData::IsFlagSet(node_->GetData().state, ui::AX_STATE_PROTECTED))
+  if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
     return nil;
   return @([[self AXValue] length]);
 }
 
 - (NSValue*)AXVisibleCharacterRange {
-  if (ui::AXNodeData::IsFlagSet(node_->GetData().state, ui::AX_STATE_PROTECTED))
+  if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
     return nil;
   return [NSValue valueWithRange:{0, [[self AXNumberOfCharacters] intValue]}];
 }
 
 - (NSNumber*)AXInsertionPointLineNumber {
-  if (ui::AXNodeData::IsFlagSet(node_->GetData().state, ui::AX_STATE_PROTECTED))
+  if (node_->GetData().HasState(ui::AX_STATE_PROTECTED))
     return nil;
   // Multiline is not supported on views.
   return @0;
 }
 
 @end
 
 namespace ui {
 
 // static
@@ skipping 46 matching lines @@
   }
   NotifyMacEvent(native_node_, event_type);
 }
 
 int AXPlatformNodeMac::GetIndexInParent() {
   // TODO(dmazzoni): implement this.  http://crbug.com/396137
   return -1;
 }
 
 }  // namespace ui