Make use of new AX name calc in Chromium.

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 534 matching lines @@
 - (NSArray*)columns {
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
   for (BrowserAccessibilityCocoa* child in [self children]) {
     if ([[child role] isEqualToString:NSAccessibilityColumnRole])
       [ret addObject:child];
   }
   return ret;
 }
 
 - (NSString*)description {
-  std::string description;
-  if (browserAccessibility_->GetStringAttribute(
-          ui::AX_ATTR_DESCRIPTION, &description)) {
-    return base::SysUTF8ToNSString(description);
+  // Mac OS X wants static text exposed in AXValue.
+  if ([self shouldExposeNameInAXValue])
+    return @"";
+
+  // If the name came from a single related element and it's present in the
+  // tree, it will be exposed in AXTitleUIElement.
+  std::vector<int32> labelledby_ids =
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
+  ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
+      browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
+  if (nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT &&
+      labelledby_ids.size() == 1 &&
+      browserAccessibility_->manager()->GetFromID(labelledby_ids[0])) {
+    return @"";
   }
 
-  // If the role is anything other than an image, or if there's
-  // a title or title UI element, just return an empty string.
-  if (![[self role] isEqualToString:NSAccessibilityImageRole])
-    return @"";
-  if (browserAccessibility_->HasStringAttribute(
-          ui::AX_ATTR_NAME)) {
-    return @"";
+  std::string name = browserAccessibility_->GetStringAttribute(
+      ui::AX_ATTR_NAME);
+  if (!name.empty()) {
+    // On Mac OS X, the accessible name of an object is exposed as its
+    // title if it comes from visible text, and as its description
+    // otherwise, but never both.
+    if (nameFrom == ui::AX_NAME_FROM_CONTENTS ||
+        nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT ||
+        nameFrom == ui::AX_NAME_FROM_VALUE) {
+      return @"";
+    } else {
+      return base::SysUTF8ToNSString(name);
+    }
   }
-  if ([self titleUIElement])
-    return @"";
 
-  // The remaining case is an image where there's no other title.
-  // Return the base part of the filename as the description.
-  std::string url;
-  if (browserAccessibility_->GetStringAttribute(
-          ui::AX_ATTR_URL, &url)) {
-    // Given a url like http://foo.com/bar/baz.png, just return the
-    // base name, e.g., "baz.png".
-    size_t leftIndex = url.rfind('/');
-    std::string basename =
-        leftIndex != std::string::npos ? url.substr(leftIndex) : url;
-    return base::SysUTF8ToNSString(basename);
+  // Given an image where there's no other title, return the base part
+  // of the filename as the description.
+  if ([[self role] isEqualToString:NSAccessibilityImageRole]) {
+    if (browserAccessibility_->HasStringAttribute(ui::AX_ATTR_NAME))
+      return @"";
+    if ([self titleUIElement])
+      return @"";
+
+    std::string url;
+    if (browserAccessibility_->GetStringAttribute(
+            ui::AX_ATTR_URL, &url)) {
+      // Given a url like http://foo.com/bar/baz.png, just return the
+      // base name, e.g., "baz.png".
+      size_t leftIndex = url.rfind('/');
+      std::string basename =
+          leftIndex != std::string::npos ? url.substr(leftIndex) : url;
+      return base::SysUTF8ToNSString(basename);
+    }
+  }
+
+  // If it's focusable but didn't have any other name or value, compute a name
+  // from its descendants.
+  std::string value = browserAccessibility_->GetStringAttribute(
+      ui::AX_ATTR_VALUE);
+  if (browserAccessibility_->HasState(ui::AX_STATE_FOCUSABLE) &&
+      !browserAccessibility_->IsControl() &&
+      value.empty() &&
+      [self internalRole] != ui::AX_ROLE_DATE_TIME &&
+      [self internalRole] != ui::AX_ROLE_WEB_AREA &&
+      [self internalRole] != ui::AX_ROLE_ROOT_WEB_AREA) {
+    return base::SysUTF8ToNSString(
+        browserAccessibility_->ComputeAccessibleNameFromDescendants());
   }
 
   return @"";
 }
 
 - (NSNumber*)disclosing {
   if ([self internalRole] == ui::AX_ROLE_TREE_ITEM) {
     return [NSNumber numberWithBool:
         GetState(browserAccessibility_, ui::AX_STATE_EXPANDED)];
   } else {
@@ skipping 79 matching lines @@
     BrowserAccessibility* headerObject =
         browserAccessibility_->manager()->GetFromID(headerElementId);
     if (headerObject)
       return headerObject->ToBrowserAccessibilityCocoa();
   }
   return nil;
 }
 
 - (NSString*)help {
   return NSStringForStringAttribute(
-      browserAccessibility_, ui::AX_ATTR_HELP);
+      browserAccessibility_, ui::AX_ATTR_DESCRIPTION);
 }
 
 - (NSNumber*)index {
   if ([self internalRole] == ui::AX_ROLE_COLUMN) {
     int columnIndex = browserAccessibility_->GetIntAttribute(
           ui::AX_ATTR_TABLE_COLUMN_INDEX);
     return [NSNumber numberWithInt:columnIndex];
   } else if ([self internalRole] == ui::AX_ROLE_ROW) {
     int rowIndex = browserAccessibility_->GetIntAttribute(
         ui::AX_ATTR_TABLE_ROW_INDEX);
@@ skipping 35 matching lines @@
       return @"true";
     }
   default:
     NOTREACHED();
   }
 
   return @"false";
 }
 
 - (NSString*)placeholderValue {
+  ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
+      browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
+  if (nameFrom == ui::AX_NAME_FROM_PLACEHOLDER) {
+    return NSStringForStringAttribute(
+        browserAccessibility_, ui::AX_ATTR_NAME);
+  }
+
+  ui::AXDescriptionFrom descriptionFrom = static_cast<ui::AXDescriptionFrom>(
+      browserAccessibility_->GetIntAttribute(ui::AX_ATTR_DESCRIPTION_FROM));
+  if (descriptionFrom == ui::AX_DESCRIPTION_FROM_PLACEHOLDER) {
+    return NSStringForStringAttribute(
+        browserAccessibility_, ui::AX_ATTR_DESCRIPTION);
+  }
+
   return NSStringForStringAttribute(
       browserAccessibility_, ui::AX_ATTR_PLACEHOLDER);
 }
 
 - (void)addLinkedUIElementsFromAttribute:(ui::AXIntListAttribute)attribute
                                    addTo:(NSMutableArray*)outArray {
   const std::vector<int32>& attributeValues =
       browserAccessibility_->GetIntListAttribute(attribute);
   for (size_t i = 0; i < attributeValues.size(); ++i) {
     BrowserAccessibility* element =
         browserAccessibility_->manager()->GetFromID(attributeValues[i]);
     if (element)
       [outArray addObject:element->ToBrowserAccessibilityCocoa()];
   }
 }
 
 - (NSArray*)linkedUIElements {
   NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
-  [self addLinkedUIElementsFromAttribute:ui::AX_ATTR_OWNS_IDS addTo:ret];
   [self addLinkedUIElementsFromAttribute:ui::AX_ATTR_CONTROLS_IDS addTo:ret];
   [self addLinkedUIElementsFromAttribute:ui::AX_ATTR_FLOWTO_IDS addTo:ret];
   if ([ret count] == 0)
     return nil;
   return ret;
 }
 
 - (NSNumber*)loaded {
   return [NSNumber numberWithBool:YES];
 }
@@ skipping 63 matching lines @@
 - (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_->GetRole());
 }
 
+// Returns true if this should expose its accessible name in AXValue.
+- (bool)shouldExposeNameInAXValue {
+  switch ([self internalRole]) {
+    case ui::AX_ROLE_LIST_BOX_OPTION:
+    case ui::AX_ROLE_LIST_MARKER:
+    case ui::AX_ROLE_MENU_LIST_OPTION:
+    case ui::AX_ROLE_STATIC_TEXT:
+      return true;
+    default:
+      return false;
+  }
+}
+
 - (content::BrowserAccessibilityDelegate*)delegate {
   return browserAccessibility_->manager() ?
       browserAccessibility_->manager()->delegate() :
       nil;
 }
 
 - (content::BrowserAccessibility*)browserAccessibility {
   return browserAccessibility_;
 }
 
@@ skipping 320 matching lines @@
   for (uint i=0; i < [[self children] count]; ++i) {
     NSArray* tabChildren = [[[self children] objectAtIndex:i] tabs];
     if ([tabChildren count] > 0)
       [tabSubtree addObjectsFromArray:tabChildren];
   }
 
   return tabSubtree;
 }
 
 - (NSString*)title {
-  return NSStringForStringAttribute(
-      browserAccessibility_, ui::AX_ATTR_NAME);
+  // Mac OS X wants static text exposed in AXValue.
+  if ([self shouldExposeNameInAXValue])
+    return @"";
+
+  // If the name came from a single related element and it's present in the
+  // tree, it will be exposed in AXTitleUIElement.
+  std::vector<int32> labelledby_ids =
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
+  ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
+      browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
+  if (nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT &&
+      labelledby_ids.size() == 1 &&
+      browserAccessibility_->manager()->GetFromID(labelledby_ids[0])) {
+    return @"";
+  }
+
+  // On Mac OS X, the accessible name of an object is exposed as its
+  // title if it comes from visible text, and as its description
+  // otherwise, but never both.
+  if (nameFrom == ui::AX_NAME_FROM_CONTENTS ||
+      nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT ||
+      nameFrom == ui::AX_NAME_FROM_VALUE) {
+    return NSStringForStringAttribute(
+        browserAccessibility_, ui::AX_ATTR_NAME);
+  }
+
+  return nil;
 }
 
 - (id)titleUIElement {
-  int titleElementId;
-  if (browserAccessibility_->GetIntAttribute(
-          ui::AX_ATTR_TITLE_UI_ELEMENT, &titleElementId)) {
-    BrowserAccessibility* titleElement =
-        browserAccessibility_->manager()->GetFromID(titleElementId);
-    if (titleElement)
-      return titleElement->ToBrowserAccessibilityCocoa();
-  }
   std::vector<int32> labelledby_ids =
       browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
-  if (labelledby_ids.size() == 1) {
+  ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
+      browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
+  if (nameFrom == ui::AX_NAME_FROM_RELATED_ELEMENT &&
+      labelledby_ids.size() == 1) {
     BrowserAccessibility* titleElement =
         browserAccessibility_->manager()->GetFromID(labelledby_ids[0]);
     if (titleElement)
       return titleElement->ToBrowserAccessibilityCocoa();
   }
 
   return nil;
 }
 
 - (NSURL*)url {
   std::string url;
   if ([[self role] isEqualToString:@"AXWebArea"])
     url = browserAccessibility_->manager()->GetTreeData().url;
   else
     url = browserAccessibility_->GetStringAttribute(ui::AX_ATTR_URL);
 
   if (url.empty())
     return nil;
 
   return [NSURL URLWithString:(base::SysUTF8ToNSString(url))];
 }
 
 - (id)value {
-  // WebCore uses an attachmentView to get the below behavior.
-  // We do not have any native views backing this object, so need
-  // to approximate Cocoa ax behavior best as we can.
   NSString* role = [self role];
-  if ([role isEqualToString:@"AXHeading"]) {
+  if ([self shouldExposeNameInAXValue]) {
+    return NSStringForStringAttribute(
+        browserAccessibility_, ui::AX_ATTR_NAME);
+  } else if ([role isEqualToString:@"AXHeading"]) {
     int level = 0;
     if (browserAccessibility_->GetIntAttribute(
             ui::AX_ATTR_HIERARCHICAL_LEVEL, &level)) {
       return [NSNumber numberWithInt:level];
     }
   } else if ([role isEqualToString:NSAccessibilityButtonRole]) {
     // AXValue does not make sense for pure buttons.
     return @"";
   } else if ([self internalRole] == ui::AX_ROLE_TOGGLE_BUTTON) {
     int value = 0;
@@ skipping 594 matching lines @@
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityPlaceholderValueAttribute, nil]];
   }
 
   if (GetState(browserAccessibility_, ui::AX_STATE_REQUIRED)) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         @"AXRequired", nil]];
   }
 
   // Title UI Element.
-  if (browserAccessibility_->HasIntAttribute(ui::AX_ATTR_TITLE_UI_ELEMENT) ||
-      (browserAccessibility_->HasIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS) &&
-       browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS)
-                            .size() == 1)) {
+  if (browserAccessibility_->HasIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS) &&
+      browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS)
+                            .size() > 0) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
          NSAccessibilityTitleUIElementAttribute,
          nil]];
   }
   // TODO(aboxhall): expose NSAccessibilityServesAsTitleForUIElementsAttribute
   // for elements which are referred to by labelledby or are labels
 
   return ret;
 }
 
@@ skipping 11 matching lines @@
   return NSNotFound;
 }
 
 // Returns whether or not the specified attribute can be set by the
 // accessibility API via |accessibilitySetValue:forAttribute:|.
 - (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute {
   if (!browserAccessibility_)
     return NO;
 
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
-    return GetState(browserAccessibility_,
-        ui::AX_STATE_FOCUSABLE);
+    if ([self internalRole] == ui::AX_ROLE_DATE_TIME)
+      return NO;
+    return GetState(browserAccessibility_, ui::AX_STATE_FOCUSABLE);
   if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
     return browserAccessibility_->GetBoolAttribute(
         ui::AX_ATTR_CAN_SET_VALUE);
   }
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute] &&
       browserAccessibility_->IsEditableText())
     return YES;
 
   return NO;
 }
@@ skipping 98 matching lines @@
   if (!browserAccessibility_)
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end