Uses isEditable and isRichlyEditable to determine which attributes to expose on Mac and how to repr…

content/browser/accessibility/browser_accessibility_win.cc

 // 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 "content/browser/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 3735 matching lines @@
   if (focus_object->IsDescendantOf(this))
     return GetHypertextOffsetFromDescendant(*focus_object);
 
   return -1;
 }
 
 void BrowserAccessibilityWin::GetSelectionOffsets(
     int* selection_start, int* selection_end) const {
   DCHECK(selection_start && selection_end);
 
-  if (GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START, selection_start) &&
+  if (HasState(ui::AX_STATE_EDITABLE) &&

[dmazzoni, 2015/09/08 21:18:44]

We already have IsEditableText - could you modify that to do the right thing and
then call that from here?

+      !HasState(ui::AX_STATE_RICHLY_EDITABLE) &&
+      GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START, selection_start) &&
       GetIntAttribute(ui::AX_ATTR_TEXT_SEL_END, selection_end)) {
     return;
   }
 
   *selection_start = GetSelectionAnchor();
   *selection_end = GetSelectionFocus();
   if (*selection_start < 0 || *selection_end < 0)
     return;
 
   if (*selection_end < *selection_start)
@@ skipping 242 matching lines @@
       BrowserAccessibilityStateImpl::GetInstance();
   if (!accessibility_state->disable_hot_tracking_for_testing()) {
     if (HasState(ui::AX_STATE_HOVERED))
       ia_state |= STATE_SYSTEM_HOTTRACKED;
   }
 
   // WebKit marks everything as readonly unless it's editable text, so if it's
   // not readonly, mark it as editable now. The final computation of the
   // READONLY state for MSAA is below, after the switch.
   if (!HasState(ui::AX_STATE_READ_ONLY))
     ia2_state |= IA2_STATE_EDITABLE;

[dmazzoni, 2015/09/08 21:18:44]

Can you fix this line too?

 
   if (GetBoolAttribute(ui::AX_ATTR_BUTTON_MIXED))
     ia_state |= STATE_SYSTEM_MIXED;
 
   if (GetBoolAttribute(ui::AX_ATTR_CAN_SET_VALUE))
     ia2_state |= IA2_STATE_EDITABLE;

[dmazzoni, 2015/09/08 21:18:44]

This line is probably wrong now, hopefully we can delete it

 
   if (!GetStringAttribute(ui::AX_ATTR_AUTO_COMPLETE).empty())
     ia2_state |= IA2_STATE_SUPPORTS_AUTOCOMPLETION;
 
   base::string16 html_tag = GetString16Attribute(
       ui::AX_ATTR_HTML_TAG);
   switch (GetRole()) {
     case ui::AX_ROLE_ALERT:
       ia_role = ROLE_SYSTEM_ALERT;
       break;
@@ skipping 384 matching lines @@
       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 (HasState(ui::AX_STATE_MULTILINE))
         ia2_state |= IA2_STATE_MULTI_LINE;
       else
         ia2_state |= IA2_STATE_SINGLE_LINE;
       ia2_state |= IA2_STATE_EDITABLE;

[dmazzoni, 2015/09/08 21:18:44]

This should hopefully no longer be needed now - and look for all other uses of
IA2_STATE_EDITABLE

       ia2_state |= IA2_STATE_SELECTABLE_TEXT;
       break;
     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;
       ia_state |= STATE_SYSTEM_READONLY;
@@ skipping 58 matching lines @@
     ia2_role = ia_role;
 
   win_attributes_->ia_role = ia_role;
   win_attributes_->ia_state = ia_state;
   win_attributes_->role_name = role_name;
   win_attributes_->ia2_role = ia2_role;
   win_attributes_->ia2_state = ia2_state;
 }
 
 }  // namespace content