Adds class, id and src attributes to object attributes of IA2.

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 3382 matching lines @@
     CComObject<BrowserAccessibilityRelation>* relation;
     HRESULT hr = CComObject<BrowserAccessibilityRelation>::CreateInstance(
         &relation);
     DCHECK(SUCCEEDED(hr));
     relation->AddRef();
     relation->Initialize(this, IA2_RELATION_LABELLED_BY);
     relation->AddTarget(title_elem_id);
     relations_.push_back(relation);
   }
 
-  // Expose slider value.
-  if (ia_role() == ROLE_SYSTEM_PROGRESSBAR ||
-      ia_role() == ROLE_SYSTEM_SCROLLBAR ||
-      ia_role() == ROLE_SYSTEM_SLIDER) {
-    win_attributes_->ia2_attributes.push_back(L"valuetext:" + GetValueText());
-  }
-
-  // Expose dropeffect attribute.
-  base::string16 dropEffect;
-  if (GetHtmlAttribute("aria-dropeffect", &dropEffect))
-    win_attributes_->ia2_attributes.push_back(L"dropeffect:" + dropEffect);
-
-  // Expose grabbed attribute.
-  base::string16 grabbed;
-  if (GetHtmlAttribute("aria-grabbed", &grabbed))
-    win_attributes_->ia2_attributes.push_back(L"grabbed:" + grabbed);
-
-  // Expose datetime attribute.
-  base::string16 datetime;
-  if (GetRole() == ui::AX_ROLE_TIME &&
-      GetHtmlAttribute("datetime", &datetime))
-    win_attributes_->ia2_attributes.push_back(L"datetime:" + datetime);
-
-  // Expose input-text type attribute.
-  base::string16 type;
-  if (GetRole() == ui::AX_ROLE_TEXT_FIELD &&
-      GetHtmlAttribute("type", &type))
-    win_attributes_->ia2_attributes.push_back(L"text-input-type:" + type);
-
+  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 (IsWebAreaForPresentationalIframe()) {
     win_attributes_->ia_role = ROLE_SYSTEM_GROUPING;
     win_attributes_->ia2_role = ROLE_SYSTEM_GROUPING;
   }
 }
 
 void BrowserAccessibilityWin::UpdateStep2ComputeHypertext() {
@@ skipping 613 matching lines @@
   }
 
   if (role == ui::AX_ROLE_MENU_LIST_OPTION &&
       parent_role == ui::AX_ROLE_MENU_LIST_POPUP) {
     return true;
   }
 
   return false;
 }
 
+void BrowserAccessibilityWin::UpdateRequiredAttributes() {
+  // Expose slider value.
+  if (ia_role() == ROLE_SYSTEM_PROGRESSBAR ||
+      ia_role() == ROLE_SYSTEM_SCROLLBAR ||
+      ia_role() == ROLE_SYSTEM_SLIDER)
+    win_attributes_->ia2_attributes.push_back(L"valuetext:" + GetValueText());
+
+  // Expose dropeffect attribute.
+  base::string16 dropEffect;
+  if (GetHtmlAttribute("aria-dropeffect", &dropEffect))
+    win_attributes_->ia2_attributes.push_back(L"dropeffect:" + dropEffect);
+
+  // Expose grabbed attribute.
+  base::string16 grabbed;
+  if (GetHtmlAttribute("aria-grabbed", &grabbed))
+    win_attributes_->ia2_attributes.push_back(L"grabbed:" + grabbed);
+
+  // Expose class attribute.
+  base::string16 class_attr;
+  if (GetHtmlAttribute("class", &class_attr))
+    win_attributes_->ia2_attributes.push_back(L"class:" + class_attr);
+
+  // Expose datetime attribute.
+  base::string16 datetime;
+  if (GetRole() == ui::AX_ROLE_TIME &&
+      GetHtmlAttribute("datetime", &datetime))
+    win_attributes_->ia2_attributes.push_back(L"datetime:" + datetime);
+
+  // Expose id attribute.
+  base::string16 id;
+  if (GetHtmlAttribute("id", &id))
+    win_attributes_->ia2_attributes.push_back(L"id:" + id);
+
+  // Expose src attribute.
+  base::string16 src;
+  if (GetRole() == ui::AX_ROLE_IMAGE &&
+      GetHtmlAttribute("src", &src))
+    win_attributes_->ia2_attributes.push_back(L"src:" + src);
+
+  // Expose input-text type attribute.
+  base::string16 type;
+  if (GetRole() == ui::AX_ROLE_TEXT_FIELD &&

[dmazzoni, 2015/10/12 22:31:39]

Perhaps we should check if the HTML tag is "input", because we should ignore
"type" for a textarea element, for example.

[je_julie(Not used), 2015/10/13 16:54:09]

Done.

+      GetHtmlAttribute("type", &type))
+    win_attributes_->ia2_attributes.push_back(L"text-input-type:" + type);
+}
+
 void BrowserAccessibilityWin::InitRoleAndState() {
   int32 ia_role = 0;
   int32 ia_state = 0;
   base::string16 role_name;
   int32 ia2_role = 0;
   int32 ia2_state = IA2_STATE_OPAQUE;
 
   if (HasState(ui::AX_STATE_BUSY))
     ia_state |= STATE_SYSTEM_BUSY;
   if (HasState(ui::AX_STATE_CHECKED))
@@ skipping 536 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