Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_cocoa.mm

 // Copyright (c) 2012 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 <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 31 matching lines @@
 struct MapEntry {
   ui::AXRole webKitValue;
   NSString* nativeValue;
 };
 
 typedef std::map<ui::AXRole, NSString*> RoleMap;
 
 // GetState checks the bitmask used in AXNodeData to check
 // if the given state was set on the accessibility object.
 bool GetState(BrowserAccessibility* accessibility, ui::AXState state) {
-  return ((accessibility->state() >> state) & 1);
+  return ((accessibility->GetState() >> state) & 1);
 }
 
 RoleMap BuildRoleMap() {
   const MapEntry roles[] = {
     { ui::AX_ROLE_ALERT, NSAccessibilityGroupRole },
     { ui::AX_ROLE_ALERT_DIALOG, NSAccessibilityGroupRole },
     { ui::AX_ROLE_ANNOTATION, NSAccessibilityUnknownRole },
     { ui::AX_ROLE_APPLICATION, NSAccessibilityGroupRole },
     { ui::AX_ROLE_ARTICLE, NSAccessibilityGroupRole },
     { ui::AX_ROLE_BANNER, NSAccessibilityGroupRole },
@@ skipping 321 matching lines @@
       }
     }
   }
   return children_;
 }
 
 - (void)childrenChanged {
   if (![self isIgnored]) {
     children_.reset();
   } else {
-    [browserAccessibility_->parent()->ToBrowserAccessibilityCocoa()
+    [browserAccessibility_->GetParent()->ToBrowserAccessibilityCocoa()
        childrenChanged];
   }
 }
 
 - (NSArray*)columnHeaders {
   if ([self internalRole] != ui::AX_ROLE_TABLE &&
       [self internalRole] != ui::AX_ROLE_GRID) {
     return nil;
   }
 
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
   const std::vector<int32>& uniqueCellIds =
       browserAccessibility_->GetIntListAttribute(
           ui::AX_ATTR_UNIQUE_CELL_IDS);
   for (size_t i = 0; i < uniqueCellIds.size(); ++i) {
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromRendererID(id);
-    if (cell && cell->role() == ui::AX_ROLE_COLUMN_HEADER)
+    if (cell && cell->GetRole() == ui::AX_ROLE_COLUMN_HEADER)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
 }
 
 - (NSValue*)columnIndexRange {
   if ([self internalRole] != ui::AX_ROLE_CELL)
     return nil;
 
   int column = -1;
@@ skipping 220 matching lines @@
 // The origin of this accessibility object in the page's document.
 // This is relative to webkit's top-left origin, not Cocoa's
 // bottom-left origin.
 - (NSPoint)origin {
   gfx::Rect bounds = browserAccessibility_->GetLocalBoundsRect();
   return NSMakePoint(bounds.x(), bounds.y());
 }
 
 - (id)parent {
   // A nil parent means we're the root.
-  if (browserAccessibility_->parent()) {
+  if (browserAccessibility_->GetParent()) {
     return NSAccessibilityUnignoredAncestor(
-        browserAccessibility_->parent()->ToBrowserAccessibilityCocoa());
+        browserAccessibility_->GetParent()->ToBrowserAccessibilityCocoa());
   } else {
     // Hook back up to RenderWidgetHostViewCocoa.
     BrowserAccessibilityManagerMac* manager =
         static_cast<BrowserAccessibilityManagerMac*>(
             browserAccessibility_->manager());
     return manager->parent_view();
   }
 }
 
 - (NSValue*)position {
   NSPoint origin = [self origin];
   NSSize size = [[self size] sizeValue];
   NSPoint pointInScreen =
       [delegate_ accessibilityPointInScreen:origin size:size];
   return [NSValue valueWithPoint:pointInScreen];
 }
 
 - (NSNumber*)required {
   return [NSNumber numberWithBool:
       GetState(browserAccessibility_, ui::AX_STATE_REQUIRED)];
 }
 
 // Returns an enum indicating the role from browserAccessibility_.
 - (ui::AXRole)internalRole {
-  return static_cast<ui::AXRole>(browserAccessibility_->role());
+  return static_cast<ui::AXRole>(browserAccessibility_->GetRole());
 }
 
 // Returns a string indicating the NSAccessibility role of this object.
 - (NSString*)role {
   ui::AXRole role = [self internalRole];
   if (role == ui::AX_ROLE_CANVAS &&
       browserAccessibility_->GetBoolAttribute(
           ui::AX_ATTR_CANVAS_HAS_FALLBACK)) {
     return NSAccessibilityGroupRole;
   }
@@ skipping 72 matching lines @@
   }
 
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
   const std::vector<int32>& uniqueCellIds =
       browserAccessibility_->GetIntListAttribute(
           ui::AX_ATTR_UNIQUE_CELL_IDS);
   for (size_t i = 0; i < uniqueCellIds.size(); ++i) {
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromRendererID(id);
-    if (cell && cell->role() == ui::AX_ROLE_ROW_HEADER)
+    if (cell && cell->GetRole() == ui::AX_ROLE_ROW_HEADER)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
 }
 
 - (NSValue*)rowIndexRange {
   if ([self internalRole] != ui::AX_ROLE_CELL)
     return nil;
 
   int row = -1;
@@ skipping 323 matching lines @@
     int num_rows = browserAccessibility_->GetIntAttribute(
         ui::AX_ATTR_TABLE_ROW_COUNT);
     if (column < 0 || column >= num_columns ||
         row < 0 || row >= num_rows) {
       return nil;
     }
     for (size_t i = 0;
          i < browserAccessibility_->PlatformChildCount();
          ++i) {
       BrowserAccessibility* child = browserAccessibility_->PlatformGetChild(i);
-      if (child->role() != ui::AX_ROLE_ROW)
+      if (child->GetRole() != ui::AX_ROLE_ROW)
         continue;
       int rowIndex;
       if (!child->GetIntAttribute(
               ui::AX_ATTR_TABLE_ROW_INDEX, &rowIndex)) {
         continue;
       }
       if (rowIndex < row)
         continue;
       if (rowIndex > row)
         break;
       for (size_t j = 0;
            j < child->PlatformChildCount();
            ++j) {
         BrowserAccessibility* cell = child->PlatformGetChild(j);
-        if (cell->role() != ui::AX_ROLE_CELL)
+        if (cell->GetRole() != ui::AX_ROLE_CELL)
           continue;
         int colIndex;
         if (!cell->GetIntAttribute(
                 ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX,
                 &colIndex)) {
           continue;
         }
         if (colIndex == column)
           return cell->ToBrowserAccessibilityCocoa();
         if (colIndex > column)
@@ skipping 203 matching lines @@
         NSAccessibilityValueDescriptionAttribute,
         nil]];
   } else if ([subrole isEqualToString:NSAccessibilityOutlineRowSubrole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityDisclosingAttribute,
         NSAccessibilityDisclosedByRowAttribute,
         NSAccessibilityDisclosureLevelAttribute,
         NSAccessibilityDisclosedRowsAttribute,
         nil]];
   } else if ([role isEqualToString:NSAccessibilityRowRole]) {
-    if (browserAccessibility_->parent()) {
+    if (browserAccessibility_->GetParent()) {
       base::string16 parentRole;
-      browserAccessibility_->parent()->GetHtmlAttribute(
+      browserAccessibility_->GetParent()->GetHtmlAttribute(
           "role", &parentRole);
       const base::string16 treegridRole(base::ASCIIToUTF16("treegrid"));
       if (parentRole == treegridRole) {
         [ret addObjectsFromArray:[NSArray arrayWithObjects:
             NSAccessibilityDisclosingAttribute,
             NSAccessibilityDisclosedByRowAttribute,
             NSAccessibilityDisclosureLevelAttribute,
             NSAccessibilityDisclosedRowsAttribute,
             nil]];
       } else {
@@ skipping 80 matching lines @@
 }
 
 // Performs the given accessibilty action on the webkit accessibility object
 // that backs this object.
 - (void)accessibilityPerformAction:(NSString*)action {
   if (!browserAccessibility_)
     return;
 
   // TODO(feldstein): Support more actions.
   if ([action isEqualToString:NSAccessibilityPressAction])
-    [delegate_ doDefaultAction:browserAccessibility_->renderer_id()];
+    [delegate_ doDefaultAction:browserAccessibility_->GetId()];
   else if ([action isEqualToString:NSAccessibilityShowMenuAction])
     [delegate_ performShowMenuAction:self];
 }
 
 // Returns the description of the given action.
 - (NSString*)accessibilityActionDescription:(NSString*)action {
   if (!browserAccessibility_)
     return nil;
 
   return NSAccessibilityActionDescription(action);
 }
 
 // Sets an override value for a specific accessibility attribute.
 // This class does not support this.
 - (BOOL)accessibilitySetOverrideValue:(id)value
                          forAttribute:(NSString*)attribute {
   return NO;
 }
 
 // Sets the value for an accessibility attribute via the accessibility API.
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
   if (!browserAccessibility_)
     return;
 
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
     NSNumber* focusedNumber = value;
     BOOL focused = [focusedNumber intValue];
     [delegate_ setAccessibilityFocus:focused
-                     accessibilityId:browserAccessibility_->renderer_id()];
+                     accessibilityId:browserAccessibility_->GetId()];
   }
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
     NSRange range = [(NSValue*)value rangeValue];
     [delegate_
-        accessibilitySetTextSelection:browserAccessibility_->renderer_id()
+        accessibilitySetTextSelection:browserAccessibility_->GetId()
         startOffset:range.location
         endOffset:range.location + range.length];
   }
 }
 
 // Returns the deepest accessibility child that should not be ignored.
 // It is assumed that the hit test has been narrowed down to this object
 // or one of its children, so this will never return nil unless this
 // object is invalid.
 - (id)accessibilityHitTest:(NSPoint)point {
@@ skipping 24 matching lines @@
 - (BOOL)isEqual:(id)object {
   if (![object isKindOfClass:[BrowserAccessibilityCocoa class]])
     return NO;
   return ([self hash] == [object hash]);
 }
 
 - (NSUInteger)hash {
   // Potentially called during dealloc.
   if (!browserAccessibility_)
     return [super hash];
-  return browserAccessibility_->renderer_id();
+  return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end