Use multiline attribute to check for IA2_STATE_MULTILINE.

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 564 matching lines @@
     bool isAriaPressedDefined;
     bool isMixed;
     browserAccessibility_->GetAriaTristate("aria-pressed",
                                            &isAriaPressedDefined,
                                            &isMixed);
     if (isAriaPressedDefined)
       return NSAccessibilityCheckBoxRole;
     else
       return NSAccessibilityButtonRole;
   }
+  if (role == ui::AX_ROLE_TEXT_FIELD &&
+    browserAccessibility_->HasState(ui::AX_STATE_MULTILINE)) {

[dmazzoni, 2015/04/07 16:12:34]

nit: indent 4 spaces when continuing a previous line

+    return NSAccessibilityTextAreaRole;
+  }
 
   // If this is a web area for a presentational iframe, give it a role of
   // something other than WebArea so that the fact that it's a separate doc
   // is not exposed to AT.
   if (browserAccessibility_->IsWebAreaForPresentationalIframe())
     return NSAccessibilityGroupRole;
 
   return [AXPlatformNodeCocoa nativeRoleFromAXRole:role];
 }
 
@@ skipping 607 matching lines @@
 - (NSArray*)accessibilityParameterizedAttributeNames {
   if (!browserAccessibility_)
     return nil;
 
   if ([[self role] isEqualToString:NSAccessibilityTableRole] ||
       [[self role] isEqualToString:NSAccessibilityGridRole]) {
     return [NSArray arrayWithObjects:
         NSAccessibilityCellForColumnAndRowParameterizedAttribute,
         nil];
   }
-  if ([[self role] isEqualToString:NSAccessibilityTextFieldRole] ||
-      [[self role] isEqualToString:NSAccessibilityTextAreaRole]) {
+  if ([[self role] isEqualToString:NSAccessibilityTextFieldRole]) {
     return [NSArray arrayWithObjects:
         NSAccessibilityLineForIndexParameterizedAttribute,
         NSAccessibilityRangeForLineParameterizedAttribute,
         NSAccessibilityStringForRangeParameterizedAttribute,
         NSAccessibilityRangeForPositionParameterizedAttribute,
         NSAccessibilityRangeForIndexParameterizedAttribute,
         NSAccessibilityBoundsForRangeParameterizedAttribute,
         NSAccessibilityRTFForRangeParameterizedAttribute,
         NSAccessibilityAttributedStringForRangeParameterizedAttribute,
         NSAccessibilityStyleRangeForIndexParameterizedAttribute,
@@ skipping 10 matching lines @@
 // Returns an array of action names that this object will respond to.
 - (NSArray*)accessibilityActionNames {
   if (!browserAccessibility_)
     return nil;
 
   NSMutableArray* ret =
       [NSMutableArray arrayWithObject:NSAccessibilityShowMenuAction];
   NSString* role = [self role];
   // TODO(dtseng): this should only get set when there's a default action.
   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.
@@ skipping 84 matching lines @@
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityColumnIndexRangeAttribute,
         NSAccessibilityRowIndexRangeAttribute,
         @"AXSortDirection",
         nil]];
   } else if ([role isEqualToString:@"AXWebArea"]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         @"AXLoaded",
         @"AXLoadingProgress",
         nil]];
-  } else if ([role isEqualToString:NSAccessibilityTextFieldRole] ||
-             [role isEqualToString:NSAccessibilityTextAreaRole]) {
+  } else if ([role isEqualToString:NSAccessibilityTextFieldRole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityInsertionPointLineNumberAttribute,
         NSAccessibilityNumberOfCharactersAttribute,
         NSAccessibilitySelectedTextAttribute,
         NSAccessibilitySelectedTextRangeAttribute,
         NSAccessibilityVisibleCharacterRangeAttribute,
         nil]];
   } else if ([role isEqualToString:NSAccessibilityTabGroupRole]) {
     [ret addObject:NSAccessibilityTabsAttribute];
   } else if ([role isEqualToString:NSAccessibilityProgressIndicatorRole] ||
@@ skipping 145 matching lines @@
     return NO;
 
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
     return GetState(browserAccessibility_,
         ui::AX_STATE_FOCUSABLE);
   if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
     return browserAccessibility_->GetBoolAttribute(
         ui::AX_ATTR_CAN_SET_VALUE);
   }
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute] &&
-      ([[self role] isEqualToString:NSAccessibilityTextFieldRole] ||
-       [[self role] isEqualToString:NSAccessibilityTextAreaRole]))
+      ([[self role] isEqualToString:NSAccessibilityTextFieldRole]))
     return YES;
 
   return NO;
 }
 
 // Returns whether or not this object should be ignored in the accessibility
 // tree.
 - (BOOL)accessibilityIsIgnored {
   if (!browserAccessibility_)
     return true;
@@ skipping 96 matching lines @@
   if (!browserAccessibility_)
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end