Slider events with valuetext

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 748 matching lines @@
     return E_INVALIDARG;
 
   state->vt = VT_I4;
   state->lVal = target->ia_state();
   if (manager->GetFocus() == owner())
     state->lVal |= STATE_SYSTEM_FOCUSED;
 
   return S_OK;
 }
 
+bool BrowserAccessibilityComWin::IsRangeValueSupported(int32_t role) {

[dmazzoni, 2017/05/19 19:03:00]

Maybe name this ia_role so that it's clear this is
a Windows role and not an internal role.

+  return role == ROLE_SYSTEM_PROGRESSBAR || role == ROLE_SYSTEM_SCROLLBAR ||
+         role == ROLE_SYSTEM_SLIDER || role == ROLE_SYSTEM_SPINBUTTON ||
+         role == ROLE_SYSTEM_SCROLLBAR || role == ROLE_SYSTEM_SEPARATOR;

[dmazzoni, 2017/05/19 19:03:00]

Some of these, like separator, are only ranges if
focusable - should that be part of the same check?

+}
+
 STDMETHODIMP BrowserAccessibilityComWin::get_accValue(VARIANT var_id,
                                                       BSTR* value) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_VALUE);
   if (!owner())
     return E_FAIL;
 
   if (!value)
     return E_INVALIDARG;
 
   BrowserAccessibilityComWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
-  if (target->ia_role() == ROLE_SYSTEM_PROGRESSBAR ||
-      target->ia_role() == ROLE_SYSTEM_SCROLLBAR ||
-      target->ia_role() == ROLE_SYSTEM_SLIDER) {
-    base::string16 value_text = target->GetValueText();
+  if (IsRangeValueSupported(target->ia_role())) {
+    base::string16 value_text = target->GetRangeValueText();
     *value = SysAllocString(value_text.c_str());
     DCHECK(*value);
     return S_OK;
   }
 
   // Expose color well value.
   if (target->ia2_role() == IA2_ROLE_COLOR_CHOOSER) {
     unsigned int color = static_cast<unsigned int>(
         target->owner()->GetIntAttribute(ui::AX_ATTR_COLOR_VALUE));
     unsigned int red = SkColorGetR(color);
@@ skipping 2768 matching lines @@
     PATTERNID id,
     IUnknown** provider) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PATTERN_PROVIDER);
   DVLOG(1) << "In Function: " << __func__ << " for pattern id: " << id;
   if (!owner())
     return E_FAIL;
 
   if (id == UIA_ValuePatternId || id == UIA_TextPatternId) {
     if (owner()->HasState(ui::AX_STATE_EDITABLE)) {
       DVLOG(1) << "Returning UIA text provider";
-      base::win::UIATextProvider::CreateTextProvider(GetValueText(), true,
+      base::win::UIATextProvider::CreateTextProvider(GetRangeValueText(), true,
                                                      provider);
       return S_OK;
     }
   }
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityComWin::GetPropertyValue(PROPERTYID id,
                                                           VARIANT* ret) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_PROPERTY_VALUE);
@@ skipping 48 matching lines @@
     if (ia_role != ROLE_SYSTEM_TABLE) {
       *object = NULL;
       return E_NOINTERFACE;
     }
   } else if (iid == IID_IAccessibleTableCell) {
     if (!accessibility->owner()->IsCellOrTableHeaderRole()) {
       *object = NULL;
       return E_NOINTERFACE;
     }
   } else if (iid == IID_IAccessibleValue) {
-    if (ia_role != ROLE_SYSTEM_PROGRESSBAR &&
-        ia_role != ROLE_SYSTEM_SCROLLBAR && ia_role != ROLE_SYSTEM_SLIDER) {
+    if (!IsRangeValueSupported(ia_role)) {
       *object = NULL;
       return E_NOINTERFACE;
     }
   } else if (iid == IID_ISimpleDOMDocument) {
     if (ia_role != ROLE_SYSTEM_DOCUMENT) {
       *object = NULL;
       return E_NOINTERFACE;
     }
   } else if (iid == IID_IAccessibleHyperlink) {
     auto* ax_object =
@@ skipping 253 matching lines @@
         break;
     }
   }
 
   win_attributes_->name = owner()->GetString16Attribute(ui::AX_ATTR_NAME);
   win_attributes_->description =
       owner()->GetString16Attribute(ui::AX_ATTR_DESCRIPTION);
   StringAttributeToIA2(ui::AX_ATTR_PLACEHOLDER, "placeholder");
 
   base::string16 value = owner()->GetValue();
-  // 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) {
-    value = base::UTF8ToUTF16(Manager()->GetTreeData().url);
+
+  // Expose slider value.
+  if (IsRangeValueSupported(ia_role())) {
+    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) {
+      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);
   }
-  // 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;
 
   ClearOwnRelations();
   AddBidirectionalRelations(IA2_RELATION_CONTROLLER_FOR,
                             IA2_RELATION_CONTROLLED_BY,
                             ui::AX_ATTR_CONTROLS_IDS);
   AddBidirectionalRelations(IA2_RELATION_DESCRIBED_BY,
                             IA2_RELATION_DESCRIPTION_FOR,
                             ui::AX_ATTR_DESCRIBEDBY_IDS);
   AddBidirectionalRelations(IA2_RELATION_FLOWS_TO, IA2_RELATION_FLOWS_FROM,
                             ui::AX_ATTR_FLOWTO_IDS);
   AddBidirectionalRelations(IA2_RELATION_LABELLED_BY, IA2_RELATION_LABEL_FOR,
                             ui::AX_ATTR_LABELLEDBY_IDS);
   AddBidirectionalRelations(IA2_RELATION_DETAILS, IA2_RELATION_DETAILS_FOR,
                             ui::AX_ATTR_DETAILS_IDS);
 
   int member_of_id;
   if (owner()->GetIntAttribute(ui::AX_ATTR_MEMBER_OF_ID, &member_of_id))
     AddRelation(IA2_RELATION_MEMBER_OF, member_of_id);
 
   int error_message_id;
   if (owner()->GetIntAttribute(ui::AX_ATTR_ERRORMESSAGE_ID, &error_message_id))
     AddRelation(IA2_RELATION_ERROR_MESSAGE, error_message_id);
 
-  // Expose slider value.
-  if (ia_role() == ROLE_SYSTEM_PROGRESSBAR ||
-      ia_role() == ROLE_SYSTEM_SCROLLBAR || ia_role() == ROLE_SYSTEM_SLIDER) {
-    base::string16 value_text = GetValueText();
-    SanitizeStringAttributeForIA2(value_text, &value_text);
-    win_attributes_->ia2_attributes.push_back(L"valuetext:" + value_text);
-  }
-
   UpdateRequiredAttributes();
   // If this is a web area for a presentational iframe, give it a role of
   // something other than DOCUMENT so that the fact that it's a separate doc
   // is not exposed to AT.
   if (owner()->IsWebAreaForPresentationalIframe()) {
     win_attributes_->ia_role = ROLE_SYSTEM_GROUPING;
     win_attributes_->ia2_role = ROLE_SYSTEM_GROUPING;
   }
 }
 
@@ skipping 707 matching lines @@
   if (!hyperlink)
     return;
 
   LONG n_selections = 0;
   HRESULT hr = hyperlink->get_nSelections(&n_selections);
   DCHECK(SUCCEEDED(hr));
   if (n_selections > 0)
     ++(*largest_offset);
 }
 
-base::string16 BrowserAccessibilityComWin::GetValueText() {
+base::string16 BrowserAccessibilityComWin::GetRangeValueText() {
   float fval;
-  base::string16 result = value();
+  base::string16 result = owner()->GetValue();
 
   if (result.empty() && GetFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE, &fval)) {
     result = base::UTF8ToUTF16(base::DoubleToString(fval));
   }
   return result;
 }
 
 bool BrowserAccessibilityComWin::IsSameHypertextCharacter(
     size_t old_char_index,
     size_t new_char_index) {
@@ skipping 1018 matching lines @@
 
 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
     BrowserAccessibility* obj) {
   if (!obj || !obj->IsNative())
     return nullptr;
   auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM();
   return result;
 }
 
 }  // namespace content