Use multiline attribute to check for IA2_STATE_MULTILINE.

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 2013 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 "content/browser/accessibility/browser_accessibility_android.h"
 
 #include "base/i18n/break_iterator.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 154 matching lines @@
 bool BrowserAccessibilityAndroid::IsContentInvalid() const {
   std::string invalid;
   return GetHtmlAttribute("aria-invalid", &invalid);
 }
 
 bool BrowserAccessibilityAndroid::IsDismissable() const {
   return false;  // No concept of "dismissable" on the web currently.
 }
 
 bool BrowserAccessibilityAndroid::IsEditableText() const {
-  return (GetRole() == ui::AX_ROLE_TEXT_AREA ||
-          GetRole() == ui::AX_ROLE_TEXT_FIELD);
+  return GetRole() == ui::AX_ROLE_TEXT_FIELD;
 }
 
 bool BrowserAccessibilityAndroid::IsEnabled() const {
   return HasState(ui::AX_STATE_ENABLED);
 }
 
 bool BrowserAccessibilityAndroid::IsFocusable() const {
   bool focusable = HasState(ui::AX_STATE_FOCUSABLE);
   if (IsIframe() ||
       GetRole() == ui::AX_ROLE_WEB_AREA) {
@@ skipping 22 matching lines @@
           GetRole() == ui::AX_ROLE_DESCRIPTION_LIST ||
           GetRole() == ui::AX_ROLE_TREE);
 }
 
 bool BrowserAccessibilityAndroid::IsLink() const {
   return (GetRole() == ui::AX_ROLE_LINK ||
          GetRole() == ui::AX_ROLE_IMAGE_MAP_LINK);
 }
 
 bool BrowserAccessibilityAndroid::IsMultiLine() const {
-  return GetRole() == ui::AX_ROLE_TEXT_AREA;
+  return HasState(ui::AX_STATE_MULTILINE);
 }
 
 bool BrowserAccessibilityAndroid::IsPassword() const {
   return HasState(ui::AX_STATE_PROTECTED);
 }
 
 bool BrowserAccessibilityAndroid::IsRangeType() const {
   return (GetRole() == ui::AX_ROLE_PROGRESS_INDICATOR ||
           GetRole() == ui::AX_ROLE_METER ||
           GetRole() == ui::AX_ROLE_SCROLL_BAR ||
@@ skipping 20 matching lines @@
 bool BrowserAccessibilityAndroid::CanOpenPopup() const {
   return HasState(ui::AX_STATE_HASPOPUP);
 }
 
 const char* BrowserAccessibilityAndroid::GetClassName() const {
   const char* class_name = NULL;
 
   switch (GetRole()) {
     case ui::AX_ROLE_SEARCH_BOX:
     case ui::AX_ROLE_SPIN_BUTTON:
-    case ui::AX_ROLE_TEXT_AREA:
     case ui::AX_ROLE_TEXT_FIELD:
       class_name = "android.widget.EditText";
       break;
     case ui::AX_ROLE_SLIDER:
       class_name = "android.widget.SeekBar";
       break;
     case ui::AX_ROLE_COLOR_WELL:
     case ui::AX_ROLE_COMBO_BOX:
     case ui::AX_ROLE_DATE:
     case ui::AX_ROLE_POP_UP_BUTTON:
@@ skipping 67 matching lines @@
   // First, always return the |value| attribute if this is an
   // input field.
   base::string16 value = GetString16Attribute(ui::AX_ATTR_VALUE);
   if (!value.empty()) {
     if (HasState(ui::AX_STATE_EDITABLE))
       return value;
 
     switch (GetRole()) {
       case ui::AX_ROLE_COMBO_BOX:
       case ui::AX_ROLE_POP_UP_BUTTON:
-      case ui::AX_ROLE_TEXT_AREA:
       case ui::AX_ROLE_TEXT_FIELD:
         return value;
     }
   }
 
   // For color wells, the color is stored in separate attributes.
   // Perhaps we could return color names in the future?
   if (GetRole() == ui::AX_ROLE_COLOR_WELL) {
     int red = GetIntAttribute(ui::AX_ATTR_COLOR_VALUE_RED);
     int green = GetIntAttribute(ui::AX_ATTR_COLOR_VALUE_GREEN);
@@ skipping 15 matching lines @@
   // title_elem_id is set, that means there's a label element
   // supplying the name and then name takes precedence over help.
   // TODO(dmazzoni): clean this up by providing more granular labels in
   // Blink, making the platform-specific mapping to accessible text simpler.
   base::string16 description = GetString16Attribute(ui::AX_ATTR_DESCRIPTION);
   base::string16 help = GetString16Attribute(ui::AX_ATTR_HELP);
 
   base::string16 placeholder;
   switch (GetRole()) {
     case ui::AX_ROLE_DATE:
-    case ui::AX_ROLE_TEXT_AREA:
     case ui::AX_ROLE_TEXT_FIELD:
     case ui::AX_ROLE_TIME:
       GetHtmlAttribute("placeholder", &placeholder);
   }
 
   int title_elem_id = GetIntAttribute(
       ui::AX_ATTR_TITLE_UI_ELEMENT);
   base::string16 text;
   if (!description.empty())
     text = description;
@@ skipping 484 matching lines @@
 int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
   int count = 0;
   for (uint32 i = 0; i < PlatformChildCount(); i++) {
     if (PlatformGetChild(i)->GetRole() == role)
       count++;
   }
   return count;
 }
 
 }  // namespace content