More precise use of multiline state

content/browser/accessibility/browser_accessibility_com_win.cc

 // Copyright (c) 2017 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_com_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 2833 matching lines @@
   if (owner()->GetString16Attribute(ui::AX_ATTR_HTML_TAG, &tag))
     *node_name = SysAllocString(tag.c_str());
   else
     *node_name = nullptr;
 
   *name_space_id = 0;
   *node_value = SysAllocString(value().c_str());
   *num_children = owner()->PlatformChildCount();
   *unique_id = -owner()->unique_id();
 
-  if (owner()->GetRole() == ui::AX_ROLE_ROOT_WEB_AREA ||
-      owner()->GetRole() == ui::AX_ROLE_WEB_AREA) {
+  if (owner()->IsDocument()) {
     *node_type = NODETYPE_DOCUMENT;
   } else if (owner()->IsTextOnlyObject()) {
     *node_type = NODETYPE_TEXT;
   } else {
     *node_type = NODETYPE_ELEMENT;
   }
 
   return S_OK;
 }
 
@@ skipping 823 matching lines @@
 
   base::string16 value = owner()->GetValue();
 
   // Expose slider value.
   if (IsRangeValueSupported()) {
     value = GetRangeValueText();
     SanitizeStringAttributeForIA2(value, &value);
     win_attributes_->ia2_attributes.push_back(L"valuetext:" + value);
   } else {
     // On Windows, the value of a document should be its url.
-    if (owner()->GetRole() == ui::AX_ROLE_ROOT_WEB_AREA ||
-        owner()->GetRole() == ui::AX_ROLE_WEB_AREA) {
+    if (owner()->IsDocument()) {
       value = base::UTF8ToUTF16(Manager()->GetTreeData().url);
     }
     // If this doesn't have a value and is linked then set its value to the url
     // attribute. This allows screen readers to read an empty link's
     // destination.
     if (value.empty() && (MSAAState() & STATE_SYSTEM_LINKED))
       value = owner()->GetString16Attribute(ui::AX_ATTR_URL);
   }
 
   win_attributes_->value = value;
@@ skipping 1226 matching lines @@
       owner()->GetIntAttribute(ui::AX_ATTR_INVALID_STATE) !=
           ui::AX_INVALID_STATE_FALSE)
     ia2_state |= IA2_STATE_INVALID_ENTRY;
   if (owner()->HasState(ui::AX_STATE_REQUIRED))
     ia2_state |= IA2_STATE_REQUIRED;
   if (owner()->HasState(ui::AX_STATE_VERTICAL))
     ia2_state |= IA2_STATE_VERTICAL;
   if (owner()->HasState(ui::AX_STATE_HORIZONTAL))
     ia2_state |= IA2_STATE_HORIZONTAL;
 
-  if (owner()->HasState(ui::AX_STATE_EDITABLE))
+  const bool is_editable = owner()->HasState(ui::AX_STATE_EDITABLE);
+  if (is_editable)
     ia2_state |= IA2_STATE_EDITABLE;
 
+  if (owner()->IsRichTextControl() || owner()->IsEditBox()) {
+    // Support multi/single line states if root editable or appropriate role.
+    // We support the edit box roles even if the area is not actually editable,
+    // because it is technically feasible for JS to implement the edit box
+    // by controlling selection.
+    if (owner()->HasState(ui::AX_STATE_MULTILINE)) {
+      ia2_state |= IA2_STATE_MULTI_LINE;
+    } else {
+      ia2_state |= IA2_STATE_SINGLE_LINE;
+    }
+  }
+
   if (!owner()->GetStringAttribute(ui::AX_ATTR_AUTO_COMPLETE).empty())
     ia2_state |= IA2_STATE_SUPPORTS_AUTOCOMPLETION;
 
   if (owner()->GetBoolAttribute(ui::AX_ATTR_MODAL))
     ia2_state |= IA2_STATE_MODAL;
 
   base::string16 html_tag = owner()->GetString16Attribute(ui::AX_ATTR_HTML_TAG);
   switch (owner()->GetRole()) {
     case ui::AX_ROLE_ALERT:
       ia_role = ROLE_SYSTEM_ALERT;
@@ skipping 352 matching lines @@
     case ui::AX_ROLE_TERM:
       ia_role = ROLE_SYSTEM_LISTITEM;
       break;
     case ui::AX_ROLE_TOGGLE_BUTTON:
       ia_role = ROLE_SYSTEM_PUSHBUTTON;
       ia2_role = IA2_ROLE_TOGGLE_BUTTON;
       break;
     case ui::AX_ROLE_TEXT_FIELD:
     case ui::AX_ROLE_SEARCH_BOX:
       ia_role = ROLE_SYSTEM_TEXT;
-      if (owner()->HasState(ui::AX_STATE_MULTILINE)) {
-        ia2_state |= IA2_STATE_MULTI_LINE;
-      } else {
-        ia2_state |= IA2_STATE_SINGLE_LINE;
-      }
+      if (owner()->HasState(ui::AX_STATE_READ_ONLY))
+        ia_state |= STATE_SYSTEM_READONLY;

[dougt, 2017/06/28 19:43:20]

hrm? I thought I got rid of ia_state on master.

       ia2_state |= IA2_STATE_SELECTABLE_TEXT;
       break;
     case ui::AX_ROLE_ABBR:
     case ui::AX_ROLE_TIME:
       role_name = html_tag;
       ia_role = ROLE_SYSTEM_TEXT;
       ia2_role = IA2_ROLE_TEXT_FRAME;
       break;
     case ui::AX_ROLE_TIMER:
       ia_role = ROLE_SYSTEM_CLOCK;
@@ skipping 67 matching lines @@
 
 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
     BrowserAccessibility* obj) {
   if (!obj || !obj->IsNative())
     return nullptr;
   auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM();
   return result;
 }
 
 }  // namespace content