Chromium Code Reviews| Index: content/browser/accessibility/accessibility_tree_formatter_utils_win.cc |
| diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc |
| index 02159bca1adb4f6d267f49236c2f3d6efd98be6d..d60efb5849fc4b447f89ce57435f154fd6b24545 100644 |
| --- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc |
| +++ b/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc |
| @@ -24,6 +24,7 @@ class AccessibilityRoleStateMap { |
| std::map<int32, base::string16> ia2_role_string_map; |
| std::map<int32, base::string16> ia_state_string_map; |
| std::map<int32, base::string16> ia2_state_string_map; |
| + std::map<int32, base::string16> event_string_map; |
| private: |
| AccessibilityRoleStateMap(); |
| @@ -47,6 +48,7 @@ AccessibilityRoleStateMap::AccessibilityRoleStateMap() { |
| #define IA2_ROLE_MAP(x) ia2_role_string_map[x] = L###x; |
| #define IA_STATE_MAP(x) ia_state_string_map[STATE_SYSTEM_##x] = L###x; |
| #define IA2_STATE_MAP(x) ia2_state_string_map[x] = L###x; |
| +#define EVENT_MAP(x) event_string_map[x] = L###x; |
| // MSAA / IAccessible roles. Each one of these is also a valid |
| // IAccessible2 role, the IA_ROLE_MAP macro adds it to both. |
| @@ -217,6 +219,75 @@ AccessibilityRoleStateMap::AccessibilityRoleStateMap() { |
| // IA2_STATE_MAP(IA2_STATE_HORIZONTAL) // Untested. |
| // IA2_STATE_MAP(IA2_STATE_OPAQUE) // Untested. |
| // IA2_STATE_MAP(IA2_STATE_VERTICAL) // Untested. |
| + |
| + EVENT_MAP(EVENT_OBJECT_CREATE) |
| + EVENT_MAP(EVENT_OBJECT_DESTROY) |
| + EVENT_MAP(EVENT_OBJECT_SHOW) |
| + EVENT_MAP(EVENT_OBJECT_HIDE) |
| + EVENT_MAP(EVENT_OBJECT_REORDER) |
| + EVENT_MAP(EVENT_OBJECT_FOCUS) |
| + EVENT_MAP(EVENT_OBJECT_SELECTION) |
| + EVENT_MAP(EVENT_OBJECT_SELECTIONADD) |
| + EVENT_MAP(EVENT_OBJECT_SELECTIONREMOVE) |
| + EVENT_MAP(EVENT_OBJECT_SELECTIONWITHIN) |
| + EVENT_MAP(EVENT_OBJECT_STATECHANGE) |
| + EVENT_MAP(EVENT_OBJECT_LOCATIONCHANGE) |
| + EVENT_MAP(EVENT_OBJECT_NAMECHANGE) |
| + EVENT_MAP(EVENT_OBJECT_DESCRIPTIONCHANGE) |
| + EVENT_MAP(EVENT_OBJECT_VALUECHANGE) |
| + EVENT_MAP(EVENT_OBJECT_PARENTCHANGE) |
| + EVENT_MAP(EVENT_OBJECT_HELPCHANGE) |
| + EVENT_MAP(EVENT_OBJECT_DEFACTIONCHANGE) |
| + EVENT_MAP(EVENT_OBJECT_ACCELERATORCHANGE) |
| + EVENT_MAP(EVENT_OBJECT_INVOKED) |
| + EVENT_MAP(EVENT_OBJECT_TEXTSELECTIONCHANGED) |
| + EVENT_MAP(EVENT_OBJECT_CONTENTSCROLLED) |
| + EVENT_MAP(EVENT_OBJECT_LIVEREGIONCHANGED) |
| + EVENT_MAP(EVENT_OBJECT_HOSTEDOBJECTSINVALIDATED) |
| + EVENT_MAP(EVENT_OBJECT_DRAGSTART) |
| + EVENT_MAP(EVENT_OBJECT_DRAGCANCEL) |
| + EVENT_MAP(EVENT_OBJECT_DRAGCOMPLETE) |
| + EVENT_MAP(EVENT_OBJECT_DRAGENTER) |
| + EVENT_MAP(EVENT_OBJECT_DRAGLEAVE) |
| + EVENT_MAP(EVENT_OBJECT_DRAGDROPPED) |
| + EVENT_MAP(EVENT_SYSTEM_ALERT) |
| + EVENT_MAP(EVENT_SYSTEM_SCROLLINGSTART) |
| + EVENT_MAP(EVENT_SYSTEM_SCROLLINGEND) |
| + EVENT_MAP(IA2_EVENT_ACTION_CHANGED) |
| + EVENT_MAP(IA2_EVENT_ACTIVE_DECENDENT_CHANGED) |
| + EVENT_MAP(IA2_EVENT_ACTIVE_DESCENDANT_CHANGED) |
| + EVENT_MAP(IA2_EVENT_DOCUMENT_ATTRIBUTE_CHANGED) |
| + EVENT_MAP(IA2_EVENT_DOCUMENT_CONTENT_CHANGED) |
| + EVENT_MAP(IA2_EVENT_DOCUMENT_LOAD_COMPLETE) |
| + EVENT_MAP(IA2_EVENT_DOCUMENT_LOAD_STOPPED) |
| + EVENT_MAP(IA2_EVENT_DOCUMENT_RELOAD) |
| + EVENT_MAP(IA2_EVENT_HYPERLINK_END_INDEX_CHANGED) |
| + EVENT_MAP(IA2_EVENT_HYPERLINK_NUMBER_OF_ANCHORS_CHANGED) |
| + EVENT_MAP(IA2_EVENT_HYPERLINK_SELECTED_LINK_CHANGED) |
| + EVENT_MAP(IA2_EVENT_HYPERTEXT_LINK_ACTIVATED) |
| + EVENT_MAP(IA2_EVENT_HYPERTEXT_LINK_SELECTED) |
| + EVENT_MAP(IA2_EVENT_HYPERLINK_START_INDEX_CHANGED) |
| + EVENT_MAP(IA2_EVENT_HYPERTEXT_CHANGED) |
| + EVENT_MAP(IA2_EVENT_HYPERTEXT_NLINKS_CHANGED) |
| + EVENT_MAP(IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED) |
| + EVENT_MAP(IA2_EVENT_PAGE_CHANGED) |
| + EVENT_MAP(IA2_EVENT_SECTION_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_CAPTION_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_COLUMN_HEADER_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_MODEL_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_ROW_DESCRIPTION_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_ROW_HEADER_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TABLE_SUMMARY_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TEXT_ATTRIBUTE_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TEXT_CARET_MOVED) |
| + EVENT_MAP(IA2_EVENT_TEXT_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TEXT_COLUMN_CHANGED) |
| + EVENT_MAP(IA2_EVENT_TEXT_INSERTED) |
| + EVENT_MAP(IA2_EVENT_TEXT_REMOVED) |
| + EVENT_MAP(IA2_EVENT_TEXT_UPDATED) |
| + EVENT_MAP(IA2_EVENT_TEXT_SELECTION_CHANGED) |
| + EVENT_MAP(IA2_EVENT_VISIBLE_DATA_CHANGED) |
| } |
| } // namespace. |
| @@ -263,4 +334,8 @@ base::string16 IAccessible2StateToString(int32 ia2_state) { |
| return JoinString(strings, ','); |
| } |
| +base::string16 AccessibilityEventToString(int32 event_id) { |
| + return AccessibilityRoleStateMap::GetInstance()->event_string_map[event_id]; |
|
David Tseng
2014/12/16 16:53:05
AccessibilityRoleStateMap no longer seems like an
dmazzoni
2014/12/16 23:26:32
Changed to AccessibilityEnumMap.
|
| +} |
| + |
| } // namespace content |