Fix up accessibility.

chrome/browser/accessibility/browser_accessibility_cocoa.mm

 // Copyright (c) 2011 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 "chrome/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include "base/string16.h"
 #include "base/sys_string_conversions.h"
@@ skipping 144 matching lines @@
     children_.reset();
   } else {
     [browserAccessibility_->parent()->toBrowserAccessibilityCocoa()
        childrenChanged];
   }
 }
 
 // Returns whether or not this node should be ignored in the
 // accessibility tree.
 - (BOOL)isIgnored {
-  return [self role] == NSAccessibilityUnknownRole;
+  return [[self role] isEqualToString:NSAccessibilityUnknownRole];
 }
 
 // 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 {
   return NSMakePoint(browserAccessibility_->location().x(),
                      browserAccessibility_->location().y());
 }
 
@@ skipping 15 matching lines @@
       role = roles[i].string;
       break;
     }
   }
 
   return role;
 }
 
 // Returns a string indicating the role description of this object.
 - (NSString*)roleDescription {
+  NSString* role = [self role];
   // The following descriptions are specific to webkit.
-  if ([[self role] isEqualToString:@"AXWebArea"])
+  if ([role isEqualToString:@"AXWebArea"])
     return l10n_util::GetNSString(IDS_AX_ROLE_WEB_AREA);
 
-  if ([[self role] isEqualToString:@"NSAccessibilityLinkRole"])
+  if ([role isEqualToString:@"NSAccessibilityLinkRole"])
     return l10n_util::GetNSString(IDS_AX_ROLE_LINK);
 
-  if ([[self role] isEqualToString:@"AXHeading"])
+  if ([role isEqualToString:@"AXHeading"])
     return l10n_util::GetNSString(IDS_AX_ROLE_HEADING);
 
-  if ([[self role] isEqualToString:NSAccessibilityGroupRole] ||
-      [[self role] isEqualToString:NSAccessibilityRadioButtonRole]) {
+  if ([role isEqualToString:NSAccessibilityGroupRole] ||
+      [role isEqualToString:NSAccessibilityRadioButtonRole]) {
     const std::vector<std::pair<string16, string16> >& htmlAttributes =
         browserAccessibility_->html_attributes();
     WebAccessibility::Role browserAccessibilityRole =
         static_cast<WebAccessibility::Role>(browserAccessibility_->role());
 
     if ((browserAccessibilityRole != WebAccessibility::ROLE_GROUP &&
          browserAccessibilityRole != WebAccessibility::ROLE_LIST_ITEM) ||
          browserAccessibilityRole == WebAccessibility::ROLE_TAB) {
       for (size_t i = 0; i < htmlAttributes.size(); ++i) {
         const std::pair<string16, string16>& htmlAttribute = htmlAttributes[i];
         if (htmlAttribute.first == ASCIIToUTF16("role")) {
           // TODO(dtseng): This is not localized; see crbug/84814.
           return base::SysUTF16ToNSString(htmlAttribute.second);
         }
       }
     }
   }
 
-  return NSAccessibilityRoleDescription([self role], nil);
+  return NSAccessibilityRoleDescription(role, nil);
 }
 
 // Returns the size of this object.
 - (NSSize)size {
   return NSMakeSize(browserAccessibility_->location().width(),
                     browserAccessibility_->location().height());
 }
 
 // Returns all tabs in this subtree.
 - (NSArray*)tabs {
@@ skipping 53 matching lines @@
   }
   if ([attribute isEqualToString:NSAccessibilityHelpAttribute]) {
     return NSStringForWebAccessibilityAttribute(
         browserAccessibility_->attributes(),
         WebAccessibility::ATTR_HELP);
   }
   if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
     // 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.
-    if ([self role] == @"AXHeading") {
+    NSString* role = [self role];
+    if ([role isEqualToString:@"AXHeading"]) {
       NSString* headingLevel =
           NSStringForWebAccessibilityAttribute(
               browserAccessibility_->attributes(),
               WebAccessibility::ATTR_HTML_TAG);
       if ([headingLevel length] >= 2) {
         return [NSNumber numberWithInt:
             [[headingLevel substringFromIndex:1] intValue]];
       }
-    } else if ([self role] == NSAccessibilityButtonRole) {
+    } else if ([role isEqualToString:NSAccessibilityButtonRole]) {
       // AXValue does not make sense for pure buttons.
       return @"";
-    } else if ([self role] == NSAccessibilityCheckBoxRole ||
-               [self role] == NSAccessibilityRadioButtonRole) {
+    } else if ([role isEqualToString:NSAccessibilityCheckBoxRole] ||
+               [role isEqualToString:NSAccessibilityRadioButtonRole]) {
       return [NSNumber numberWithInt:GetState(
           browserAccessibility_, WebAccessibility::STATE_CHECKED) ? 1 : 0];
     } else {
       return base::SysUTF16ToNSString(browserAccessibility_->value());
     }
   }
   if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
     return [self roleDescription];
   }
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
@@ skipping 100 matching lines @@
       [attribute isEqualTo:
           NSAccessibilityStyleRangeForIndexParameterizedAttribute]) {
     return nil;
   }
   return nil;
 }
 
 // Returns an array of parameterized attributes names that this object will
 // respond to.
 - (NSArray*)accessibilityParameterizedAttributeNames {
-  if ([self role] == NSAccessibilityTextFieldRole) {
+  if ([[self role] isEqualToString:NSAccessibilityTextFieldRole]) {
     return [NSArray arrayWithObjects:
         NSAccessibilityLineForIndexParameterizedAttribute,
         NSAccessibilityRangeForLineParameterizedAttribute,
         NSAccessibilityStringForRangeParameterizedAttribute,
         NSAccessibilityRangeForPositionParameterizedAttribute,
         NSAccessibilityRangeForIndexParameterizedAttribute,
         NSAccessibilityBoundsForRangeParameterizedAttribute,
         NSAccessibilityRTFForRangeParameterizedAttribute,
         NSAccessibilityAttributedStringForRangeParameterizedAttribute,
         NSAccessibilityStyleRangeForIndexParameterizedAttribute,
         nil];
   }
   return nil;
 }
 
 // Returns an array of action names that this object will respond to.
 - (NSArray*)accessibilityActionNames {
-  NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease];
-
-  // General actions.
-  [ret addObject:NSAccessibilityShowMenuAction];
-
+  NSMutableArray* ret =
+      [NSMutableArray arrayWithObject:NSAccessibilityShowMenuAction];
+  NSString* role = [self role];
   // TODO(dtseng): this should only get set when there's a default action.
-  if ([self role] != NSAccessibilityStaticTextRole &&
-      [self role] != NSAccessibilityTextAreaRole &&
-      [self role] != NSAccessibilityTextFieldRole) {
+  if (![role isEqualToString:NSAccessibilityStaticTextRole] &&
+      ![role isEqualToString:NSAccessibilityTextAreaRole] &&
+      ![role isEqualToString:NSAccessibilityTextFieldRole]) {
     [ret addObject:NSAccessibilityPressAction];
   }
 
   return ret;
 }
 
 // Returns a sub-array of values for the given attribute value, starting at
 // index, with up to maxCount items.  If the given index is out of bounds,
 // or there are no values for the given attribute, it will return nil.
 // This method is used for querying subsets of values, without having to
@@ skipping 18 matching lines @@
 }
 
 // Returns the count of the specified accessibility array attribute.
 - (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute {
   NSArray* fullArray = [self accessibilityAttributeValue:attribute];
   return [fullArray count];
 }
 
 // Returns the list of accessibility attributes that this object supports.
 - (NSArray*)accessibilityAttributeNames {
-  NSMutableArray* ret = [[NSMutableArray alloc] init];
-
   // General attributes.
-  [ret addObjectsFromArray:[NSArray arrayWithObjects:
+  NSMutableArray* ret = [NSMutableArray arrayWithObjects:
       NSAccessibilityChildrenAttribute,
       NSAccessibilityDescriptionAttribute,
       NSAccessibilityEnabledAttribute,
       NSAccessibilityFocusedAttribute,
       NSAccessibilityHelpAttribute,
       NSAccessibilityParentAttribute,
       NSAccessibilityPositionAttribute,
       NSAccessibilityRoleAttribute,
       NSAccessibilityRoleDescriptionAttribute,
       NSAccessibilitySizeAttribute,
       NSAccessibilityTitleAttribute,
       NSAccessibilityTopLevelUIElementAttribute,
       NSAccessibilityValueAttribute,
       NSAccessibilityWindowAttribute,
       NSAccessibilityURLAttribute,
       @"AXVisited",
-      nil]];
+      nil];
 
   // Specific role attributes.
-  if ([self role] == NSAccessibilityTableRole) {
+  NSString* role = [self role];
+  if ([role isEqualToString:NSAccessibilityTableRole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityColumnsAttribute,
         NSAccessibilityRowsAttribute,
         nil]];
-  }
-
-  if ([self role] == @"AXWebArea") {
-    [ret addObjectsFromArray:[NSArray arrayWithObjects:
-        @"AXLoaded",
-        nil]];
-  }
-
-  if ([self role] == NSAccessibilityTextFieldRole) {
+  } else if ([role isEqualToString:@"AXWebArea"]) {
+    [ret addObject:@"AXLoaded"];
+  } else if ([role isEqualToString:NSAccessibilityTextFieldRole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityInsertionPointLineNumberAttribute,
         NSAccessibilityNumberOfCharactersAttribute,
         NSAccessibilitySelectedTextAttribute,
         NSAccessibilitySelectedTextRangeAttribute,
         NSAccessibilityVisibleCharacterRangeAttribute,
         nil]];
+  } else if ([role isEqualToString:NSAccessibilityTabGroupRole]) {
+    [ret addObject:NSAccessibilityTabsAttribute];
   }
 
-  if ([self role] == NSAccessibilityTabGroupRole)
-    [ret addObject:NSAccessibilityTabsAttribute];
-
   return ret;
 }
 
 // Returns the index of the child in this objects array of children.
 - (NSUInteger)accessibilityGetIndexOf:(id)child {
   NSUInteger index = 0;
   for (BrowserAccessibilityCocoa* childToCheck in [self children]) {
     if ([child isEqual:childToCheck])
       return index;
     ++index;
@@ skipping 80 matching lines @@
 
 - (NSUInteger)hash {
   // Potentially called during dealloc.
   if (!browserAccessibility_)
     return [super hash];
   return browserAccessibility_->renderer_id();
 }
 
 @end