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 2914 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 (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 (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() && (ia_state() & STATE_SYSTEM_LINKED))
       value = owner()->GetString16Attribute(ui::AX_ATTR_URL);
   }
 
   win_attributes_->value = value;
@@ skipping 503 matching lines @@
 
 void BrowserAccessibilityComWin::IntAttributeToIA2(ui::AXIntAttribute attribute,
                                                    const char* ia2_attr) {
   int value;
   if (owner()->GetIntAttribute(attribute, &value)) {
     win_attributes_->ia2_attributes.push_back(
         base::ASCIIToUTF16(ia2_attr) + L":" + base::IntToString16(value));
   }
 }
 
+bool BrowserAccessibilityComWin::IsDocument() const {
+  return owner()->GetRole() == ui::AX_ROLE_ROOT_WEB_AREA ||
+         owner()->GetRole() == ui::AX_ROLE_WEB_AREA;
+}
+
+bool BrowserAccessibilityComWin::IsRootEditable() const {
+  if (!owner()->HasState(ui::AX_STATE_EDITABLE))
+    return false;
+
+  if (IsDocument())
+    return true;
+
+  BrowserAccessibility* parent = owner()->PlatformGetParent();

[dougt, 2017/06/23 18:27:18]

I am confused by this. 

GetParent() is just returning the node above |this| one.  Shouldn't we walk up
the tree to the root?

[aleventhal, 2017/06/28 14:20:57]

It does what I want, but maybe it needs a different name.

This is looking to see if we're in an editable area AND we're in the top
editable element of that area. If the thing above us is not editable, then we
aren't in a root editable.

For example:

Section -- not editable
  Paragraph -- editable
    Link -- editable

Only the paragraph there is a root editable.

+  return !parent || !parent->HasState(ui::AX_STATE_EDITABLE);
+}
+
+bool BrowserAccessibilityComWin::IsEditBoxRole() const {
+  const int32_t role = owner()->GetRole();
+  return role == ui::AX_ROLE_TEXT_FIELD || role == ui::AX_ROLE_SEARCH_BOX;
+}
+
 bool BrowserAccessibilityComWin::IsHyperlink() const {
   int32_t hyperlink_index = -1;
   auto* parent = owner()->PlatformGetParent();
   if (parent) {
     hyperlink_index =
         ToBrowserAccessibilityComWin(parent)->GetHyperlinkIndexFromChild(*this);
   }
 
   if (hyperlink_index >= 0)
     return true;
@@ skipping 41 matching lines @@
   return -1;
 }
 
 int32_t BrowserAccessibilityComWin::GetHypertextOffsetFromChild(
     BrowserAccessibilityComWin& child) {
   DCHECK(child.owner()->PlatformGetParent() == owner());
 
   // Handle the case when we are dealing with a direct text-only child.
   // (Note that this object might be a platform leaf, e.g. an ARIA searchbox,
   // and so |owner()->InternalChild...| functions need to be used. Also,
-  // direct text-only children should not be present at tree roots and so no
+  // direct text-only children should not be present at tree  s and so no

[dougt, 2017/06/23 18:27:18]

I don't think you want this change.

[aleventhal, 2017/06/28 14:20:57]

Done.

   // cross-tree traversal is necessary.)
   if (child.owner()->IsTextOnlyObject()) {
     int32_t hypertextOffset = 0;
     int32_t index_in_parent = child.GetIndexInParent();
     DCHECK_GE(index_in_parent, 0);
     DCHECK_LT(index_in_parent,
               static_cast<int32_t>(owner()->InternalChildCount()));
     for (uint32_t i = 0; i < static_cast<uint32_t>(index_in_parent); ++i) {
       const BrowserAccessibilityComWin* sibling =
           ToBrowserAccessibilityComWin(owner()->InternalGetChild(i));
@@ skipping 694 matching lines @@
   // Expose whether or not the mouse is over an element, but suppress
   // this for tests because it can make the test results flaky depending
   // on the position of the mouse.
   BrowserAccessibilityStateImpl* accessibility_state =
       BrowserAccessibilityStateImpl::GetInstance();
   if (!accessibility_state->disable_hot_tracking_for_testing()) {
     if (owner()->HasState(ui::AX_STATE_HOVERED))
       ia_state |= STATE_SYSTEM_HOTTRACKED;
   }
 
-  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;
+  }

[dougt, 2017/06/23 18:27:17]

Since this is a one liner, you don't need the curly braces.

[aleventhal, 2017/06/28 14:20:57]

Done.

+
+  if (is_editable ? IsRootEditable() : IsEditBoxRole()) {
+    // Support multi/single line states if root edtiable 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:
@@ skipping 377 matching lines @@
       ia_role = ROLE_SYSTEM_LISTITEM;
       ia_state |= STATE_SYSTEM_READONLY;
       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;
       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;
@@ skipping 88 matching lines @@
 
 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
     BrowserAccessibility* obj) {
   if (!obj || !obj->IsNative())
     return nullptr;
   auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM();
   return result;
 }
 
 }  // namespace content