ARIA 1.1: implementation for aria-col-* and aria-row-*.

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 369 matching lines @@
     { NSAccessibilityValueDescriptionAttribute, @"valueDescription" },
     { NSAccessibilityVisibleCharacterRangeAttribute, @"visibleCharacterRange" },
     { NSAccessibilityVisibleCellsAttribute, @"visibleCells" },
     { NSAccessibilityVisibleChildrenAttribute, @"visibleChildren" },
     { NSAccessibilityVisibleColumnsAttribute, @"visibleColumns" },
     { NSAccessibilityVisibleRowsAttribute, @"visibleRows" },
     { NSAccessibilityWindowAttribute, @"window" },
     { @"AXAccessKey", @"accessKey" },
     { @"AXARIAAtomic", @"ariaAtomic" },
     { @"AXARIABusy", @"ariaBusy" },
+    { @"AXARIAColumnCount", @"ariaColumnCount" },
+    { @"AXARIAColumnIndex", @"ariaColumnIndex" },
     { @"AXARIALive", @"ariaLive" },
     { @"AXARIASetSize", @"ariaSetSize" },
     { @"AXARIAPosInSet", @"ariaPosInSet" },
     { @"AXARIARelevant", @"ariaRelevant" },
+    { @"AXARIARowCount", @"ariaRowCount" },
+    { @"AXARIARowIndex", @"ariaRowIndex" },
     { @"AXDropEffects", @"dropeffect" },
     { @"AXGrabbed", @"grabbed" },
     { @"AXInvalid", @"invalid" },
     { @"AXLoaded", @"loaded" },
     { @"AXLoadingProgress", @"loadingProgress" },
     { @"AXRequired", @"required" },
     { @"AXSortDirection", @"sortDirection" },
     { @"AXVisited", @"visited" },
   };
 
@@ skipping 30 matching lines @@
   bool boolValue = browserAccessibility_->GetBoolAttribute(
       ui::AX_ATTR_LIVE_ATOMIC);
   return [NSNumber numberWithBool:boolValue];
 }
 
 - (NSNumber*)ariaBusy {
   return [NSNumber numberWithBool:
       GetState(browserAccessibility_, ui::AX_STATE_BUSY)];
 }
 
+- (NSNumber*)ariaColumnCount {
+  if (!browserAccessibility_->IsTableOrGridOrTreeGridRole())
+    return nil;
+  int count = -1;
+  if (!browserAccessibility_->GetIntAttribute(
+      ui::AX_ATTR_ARIA_COL_COUNT, &count))
+    return nil;
+  return [NSNumber numberWithInt:count];
+}
+
+- (NSNumber*)ariaColumnIndex {
+  if (!browserAccessibility_->IsCellOrTableHeaderRole())
+    return nil;
+  int index = -1;
+  if (!browserAccessibility_->GetIntAttribute(
+      ui::AX_ATTR_ARIA_COL_INDEX, &index))
+    return nil;
+  return [NSNumber numberWithInt:index];
+}
+
 - (NSString*)ariaLive {
   return NSStringForStringAttribute(
       browserAccessibility_, ui::AX_ATTR_LIVE_STATUS);
 }
 
 - (NSString*)ariaRelevant {
   return NSStringForStringAttribute(
       browserAccessibility_, ui::AX_ATTR_LIVE_RELEVANT);
 }
 
+- (NSNumber*)ariaRowCount {
+  if (!browserAccessibility_->IsTableOrGridOrTreeGridRole())
+    return nil;
+  int count = -1;
+  if (!browserAccessibility_->GetIntAttribute(
+      ui::AX_ATTR_ARIA_ROW_COUNT, &count))
+    return nil;
+  return [NSNumber numberWithInt:count];
+}
+
+- (NSNumber*)ariaRowIndex {
+  if (!browserAccessibility_->IsCellOrTableHeaderRole())
+    return nil;
+  int index = -1;
+  if (!browserAccessibility_->GetIntAttribute(
+      ui::AX_ATTR_ARIA_ROW_INDEX, &index))
+    return nil;
+  return [NSNumber numberWithInt:index];
+}
+
 - (NSNumber*)ariaPosInSet {
   return [NSNumber numberWithInt:
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_POS_IN_SET)];
 }
 
 - (NSNumber*)ariaSetSize {
   return [NSNumber numberWithInt:
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_SET_SIZE)];
 }
 
@@ skipping 1178 matching lines @@
 - (NSArray*)accessibilityParameterizedAttributeNames {
   if (!browserAccessibility_)
     return nil;
 
   // General attributes.
   NSMutableArray* ret = [NSMutableArray arrayWithObjects:
       @"AXUIElementCountForSearchPredicate",
       @"AXUIElementsForSearchPredicate",
       nil];
 
-  if ([[self role] isEqualToString:NSAccessibilityTableRole] ||
-      [[self role] isEqualToString:NSAccessibilityGridRole]) {
+  if (browserAccessibility_->IsTableOrGridOrTreeGridRole()) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityCellForColumnAndRowParameterizedAttribute,
         nil]];
   }
 
   if (browserAccessibility_->IsEditableText()) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityLineForIndexParameterizedAttribute,
         NSAccessibilityRangeForLineParameterizedAttribute,
         NSAccessibilityStringForRangeParameterizedAttribute,
@@ skipping 93 matching lines @@
       NSAccessibilityValueAttribute,
       NSAccessibilityWindowAttribute,
       @"AXAccessKey",
       @"AXInvalid",
       @"AXVisited",
       nil];
 
   // Specific role attributes.
   NSString* role = [self role];
   NSString* subrole = [self subrole];
-  if ([role isEqualToString:NSAccessibilityTableRole] ||
-      [role isEqualToString:NSAccessibilityGridRole]) {
+  if (browserAccessibility_->IsTableOrGridOrTreeGridRole()) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityColumnsAttribute,
         NSAccessibilityVisibleColumnsAttribute,
         NSAccessibilityRowsAttribute,
         NSAccessibilityVisibleRowsAttribute,
         NSAccessibilityVisibleCellsAttribute,
         NSAccessibilityHeaderAttribute,
         NSAccessibilityColumnHeaderUIElementsAttribute,
         NSAccessibilityRowHeaderUIElementsAttribute,
+        @"AXARIAColumnCount",
+        @"AXARIARowCount",
         nil]];
   } else if ([role isEqualToString:NSAccessibilityColumnRole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityIndexAttribute,
         NSAccessibilityHeaderAttribute,
         NSAccessibilityRowsAttribute,
         NSAccessibilityVisibleRowsAttribute,
         nil]];
-  } else if ([role isEqualToString:NSAccessibilityCellRole]) {
+  } else if (browserAccessibility_->IsCellOrTableHeaderRole()) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityColumnIndexRangeAttribute,
         NSAccessibilityRowIndexRangeAttribute,
+        @"AXARIAColumnIndex",
+        @"AXARIARowIndex",
         @"AXSortDirection",
         nil]];
   } else if ([role isEqualToString:@"AXWebArea"]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         @"AXLoaded",
         @"AXLoadingProgress",
         nil]];
   } else if ([role isEqualToString:NSAccessibilityTabGroupRole]) {
     [ret addObject:NSAccessibilityTabsAttribute];
   } else if ([role isEqualToString:NSAccessibilityProgressIndicatorRole] ||
@@ skipping 286 matching lines @@
   if (!browserAccessibility_)
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end