Show group position in IA2 event formatter

Bug: None
Change-Id: I97010e6898ca9e7dd48f6cdc4a43460db850bc5d
Reviewed-on: https://chromium-review.googlesource.com/1078915
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564660}

content/browser/accessibility/accessibility_event_recorder_win.cc

@@ -307,6 +307,18 @@ void AccessibilityEventRecorderWin::OnWinEventHook(
   log += " ";
   log += base::UTF16ToUTF8(IAccessible2StateToString(ia2_state));
 
+  // Group position, e.g. L3, 5 of 7
+  LONG group_level, similar_items_in_group, position_in_group;
+  if (iaccessible2->get_groupPosition(&group_level, &similar_items_in_group,
+                                      &position_in_group) == S_OK) {
+    if (group_level)
+      log += base::StringPrintf(" level=%ld", group_level);
+    if (similar_items_in_group) {
+      log += base::StringPrintf(" %ld of %ld", position_in_group,
+                                similar_items_in_group);
+    }
+  }
+
   // For TEXT_REMOVED and TEXT_INSERTED events, query the text that was
   // inserted or removed and include that in the log.
   Microsoft::WRL::ComPtr<IAccessibleText> accessible_text;

content/test/data/accessibility/event/add-hidden-attribute-expected-win.txt

-EVENT_OBJECT_HIDE on <div#item3> role=ROLE_SYSTEM_LISTITEM name="Item 3"
+EVENT_OBJECT_HIDE on <div#item3> role=ROLE_SYSTEM_LISTITEM name="Item 3" 3 of 3
 EVENT_OBJECT_REORDER on <div> role=ROLE_SYSTEM_LIST
-IA2_EVENT_TEXT_REMOVED on <div> role=ROLE_SYSTEM_LIST old_text={'<obj>' start=2 end=3}
+IA2_EVENT_TEXT_REMOVED on <div> role=ROLE_SYSTEM_LIST old_text={'<obj>' start=2 end=3}
\ No newline at end of file

content/test/data/accessibility/event/add-hidden-attribute-subtree-expected-win.txt

-EVENT_OBJECT_HIDE on <li#item3> role=ROLE_SYSTEM_LISTITEM
+EVENT_OBJECT_HIDE on <li#item3> role=ROLE_SYSTEM_LISTITEM 3 of 3
 EVENT_OBJECT_REORDER on <ul> role=ROLE_SYSTEM_LIST
-IA2_EVENT_TEXT_REMOVED on <ul> role=ROLE_SYSTEM_LIST old_text={'<obj>' start=2 end=3}
+IA2_EVENT_TEXT_REMOVED on <ul> role=ROLE_SYSTEM_LIST old_text={'<obj>' start=2 end=3}
\ No newline at end of file

content/test/data/accessibility/event/add-subtree-expected-win.txt

 EVENT_OBJECT_REORDER on <ul> role=ROLE_SYSTEM_LIST
-EVENT_OBJECT_SHOW on <li> role=ROLE_SYSTEM_LISTITEM
-IA2_EVENT_TEXT_INSERTED on <ul> role=ROLE_SYSTEM_LIST new_text={'<obj>' start=2 end=3}
+EVENT_OBJECT_SHOW on <li> role=ROLE_SYSTEM_LISTITEM 3 of 3
+IA2_EVENT_TEXT_INSERTED on <ul> role=ROLE_SYSTEM_LIST new_text={'<obj>' start=2 end=3}
\ No newline at end of file

content/test/data/accessibility/event/aria-combo-box-delay-add-list-expected-win.txt

-EVENT_OBJECT_FOCUS on <li#op1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE
+EVENT_OBJECT_FOCUS on <li#op1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE 1 of 1
 IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
 IA2_EVENT_TEXT_INSERTED on <div#container> role=DIV new_text={'<obj>' start=0 end=1}

content/test/data/accessibility/event/aria-combo-box-expand-expected-win.txt

-EVENT_OBJECT_FOCUS on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE
-EVENT_OBJECT_SELECTION on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE
+EVENT_OBJECT_FOCUS on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE 1 of 3
+EVENT_OBJECT_SELECTION on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE 1 of 3
 EVENT_OBJECT_SELECTIONWITHIN on <ul#list> role=ROLE_SYSTEM_LIST IA2_STATE_VERTICAL
 EVENT_OBJECT_STATECHANGE on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
-EVENT_OBJECT_STATECHANGE on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE
-IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
+EVENT_OBJECT_STATECHANGE on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE 1 of 3
+IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
\ No newline at end of file

content/test/data/accessibility/event/aria-combo-box-focus-expected-win.txt

-EVENT_OBJECT_FOCUS on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" FOCUSED,FOCUSABLE,SELECTABLE
-IA2_EVENT_TEXT_CARET_MOVED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
+EVENT_OBJECT_FOCUS on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" FOCUSED,FOCUSABLE,SELECTABLE 1 of 3
+IA2_EVENT_TEXT_CARET_MOVED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
\ No newline at end of file

content/test/data/accessibility/event/aria-combo-box-next-expected-win.txt

-EVENT_OBJECT_FOCUS on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE
-EVENT_OBJECT_SELECTION on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,FOCUSABLE,SELECTABLE
+EVENT_OBJECT_FOCUS on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE 3 of 3
+EVENT_OBJECT_SELECTION on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,FOCUSABLE,SELECTABLE 3 of 3
 EVENT_OBJECT_SELECTIONWITHIN on <ul#list> role=ROLE_SYSTEM_LIST IA2_STATE_VERTICAL
-EVENT_OBJECT_STATECHANGE on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,FOCUSABLE,SELECTABLE
-IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
+EVENT_OBJECT_STATECHANGE on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,FOCUSABLE,SELECTABLE 3 of 3
+IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <input> role=ROLE_SYSTEM_COMBOBOX EXPANDED,FOCUSABLE,HASPOPUP IA2_STATE_EDITABLE,IA2_STATE_SELECTABLE_TEXT,IA2_STATE_SINGLE_LINE,IA2_STATE_SUPPORTS_AUTOCOMPLETION
\ No newline at end of file

content/test/data/accessibility/event/checked-state-changed-expected-win.txt

-EVENT_OBJECT_STATECHANGE on <div#treeitem> role=ROLE_SYSTEM_OUTLINEITEM name="Treeitem" CHECKED,SELECTABLE IA2_STATE_CHECKABLE
-EVENT_OBJECT_STATECHANGE on <input#c> role=ROLE_SYSTEM_CHECKBUTTON name="My Checkbox" CHECKED,FOCUSABLE IA2_STATE_CHECKABLE
+EVENT_OBJECT_STATECHANGE on <div#treeitem> role=ROLE_SYSTEM_OUTLINEITEM name="Treeitem" CHECKED,SELECTABLE IA2_STATE_CHECKABLE level=1 1 of 1
+EVENT_OBJECT_STATECHANGE on <input#c> role=ROLE_SYSTEM_CHECKBUTTON name="My Checkbox" CHECKED,FOCUSABLE IA2_STATE_CHECKABLE
\ No newline at end of file

content/test/data/accessibility/event/css-display-expected-win.txt

-EVENT_OBJECT_HIDE on <div.a> role=DIV name="Heading"
+EVENT_OBJECT_HIDE on <div.a> role=DIV name="Heading" level=2
 EVENT_OBJECT_REORDER on <div> role=ROLE_SYSTEM_TOOLBAR IA2_STATE_HORIZONTAL
 EVENT_OBJECT_SHOW on <div.b> role=ROLE_SYSTEM_GROUPING name="Banner"
 IA2_EVENT_TEXT_INSERTED on <div> role=ROLE_SYSTEM_TOOLBAR IA2_STATE_HORIZONTAL new_text={'<obj>' start=0 end=1}

content/test/data/accessibility/event/css-visibility-expected-win.txt

-EVENT_OBJECT_HIDE on <div.a> role=DIV name="Heading"
+EVENT_OBJECT_HIDE on <div.a> role=DIV name="Heading" level=2
 EVENT_OBJECT_REORDER on <div> role=ROLE_SYSTEM_TOOLBAR IA2_STATE_HORIZONTAL
 EVENT_OBJECT_SHOW on <div.b> role=ROLE_SYSTEM_GROUPING name="Banner"
 IA2_EVENT_TEXT_INSERTED on <div> role=ROLE_SYSTEM_TOOLBAR IA2_STATE_HORIZONTAL new_text={'<obj>' start=0 end=1}

content/test/data/accessibility/event/description-change-expected-win.txt

-EVENT_OBJECT_DESCRIPTIONCHANGE on <h1#a> role=H1 name="Before"
+EVENT_OBJECT_DESCRIPTIONCHANGE on <h1#a> role=H1 name="Before" level=1

content/test/data/accessibility/event/description-change-indirect-expected-win.txt

 EVENT_OBJECT_DESCRIPTIONCHANGE on <div> role=ROLE_SYSTEM_GROUPING
 EVENT_OBJECT_HIDE on role=ROLE_SYSTEM_STATICTEXT name="apples"
-EVENT_OBJECT_NAMECHANGE on <h1#title> role=H1 name="oranges"
-EVENT_OBJECT_REORDER on <h1#title> role=H1 name="oranges"
+EVENT_OBJECT_NAMECHANGE on <h1#title> role=H1 name="oranges" level=1
+EVENT_OBJECT_REORDER on <h1#title> role=H1 name="oranges" level=1
 EVENT_OBJECT_SHOW on role=ROLE_SYSTEM_STATICTEXT name="oranges"
-IA2_EVENT_TEXT_INSERTED on <h1#title> role=H1 name="oranges" new_text={'orang' start=0 end=5}
-IA2_EVENT_TEXT_REMOVED on <h1#title> role=H1 name="oranges" old_text={'appl' start=0 end=4}
+IA2_EVENT_TEXT_INSERTED on <h1#title> role=H1 name="oranges" level=1 new_text={'orang' start=0 end=5}
+IA2_EVENT_TEXT_REMOVED on <h1#title> role=H1 name="oranges" level=1 old_text={'appl' start=0 end=4}

content/test/data/accessibility/event/inner-html-change-expected-win.txt

-EVENT_OBJECT_HIDE on <h1> role=H1 name="A"
+EVENT_OBJECT_HIDE on <h1> role=H1 name="A" level=1
 EVENT_OBJECT_HIDE on <p> role=P
-EVENT_OBJECT_SHOW on <h1> role=H1 name="C"
+EVENT_OBJECT_SHOW on <h1> role=H1 name="C" level=1
 EVENT_OBJECT_SHOW on <p> role=P
 IA2_EVENT_TEXT_INSERTED on <div#main> role=ROLE_SYSTEM_GROUPING new_text={'<obj><obj>' start=0 end=2}
 IA2_EVENT_TEXT_REMOVED on <div#main> role=ROLE_SYSTEM_GROUPING old_text={'<obj><obj>' start=0 end=2}

content/test/data/accessibility/event/listbox-next-expected-win.txt

-EVENT_OBJECT_FOCUS on <option> role=ROLE_SYSTEM_LISTITEM name="Orange" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE
-EVENT_OBJECT_SELECTION on <option> role=ROLE_SYSTEM_LISTITEM name="Orange" SELECTED,FOCUSABLE,SELECTABLE
+EVENT_OBJECT_FOCUS on <option> role=ROLE_SYSTEM_LISTITEM name="Orange" SELECTED,FOCUSED,FOCUSABLE,SELECTABLE 2 of 3
+EVENT_OBJECT_SELECTION on <option> role=ROLE_SYSTEM_LISTITEM name="Orange" SELECTED,FOCUSABLE,SELECTABLE 2 of 3
 EVENT_OBJECT_SELECTIONWITHIN on <select> role=ROLE_SYSTEM_LIST FOCUSABLE IA2_STATE_VERTICAL
-EVENT_OBJECT_STATECHANGE on <option> role=ROLE_SYSTEM_LISTITEM name="Apple" FOCUSABLE,SELECTABLE
-EVENT_OBJECT_STATECHANGE on <option> role=ROLE_SYSTEM_LISTITEM name="Orange" SELECTED,FOCUSABLE,SELECTABLE
-IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <select> role=ROLE_SYSTEM_LIST FOCUSABLE IA2_STATE_VERTICAL
+EVENT_OBJECT_STATECHANGE on <option> role=ROLE_SYSTEM_LISTITEM name="Apple" FOCUSABLE,SELECTABLE 1 of 3
+EVENT_OBJECT_STATECHANGE on <option> role=ROLE_SYSTEM_LISTITEM name="Orange" SELECTED,FOCUSABLE,SELECTABLE 2 of 3
+IA2_EVENT_ACTIVE_DESCENDANT_CHANGED on <select> role=ROLE_SYSTEM_LIST FOCUSABLE IA2_STATE_VERTICAL
\ No newline at end of file

content/test/data/accessibility/event/menulist-collapse-expected-win.txt

-EVENT_OBJECT_STATECHANGE on <option> role=ROLE_SYSTEM_LISTITEM name="Apple" FOCUSED,INVISIBLE,FOCUSABLE,SELECTABLE
+EVENT_OBJECT_STATECHANGE on <option> role=ROLE_SYSTEM_LISTITEM name="Apple" FOCUSED,INVISIBLE,FOCUSABLE,SELECTABLE 1 of 3
 EVENT_OBJECT_VALUECHANGE on <select> role=ROLE_SYSTEM_COMBOBOX COLLAPSED,FOCUSABLE,HASPOPUP

content/test/data/accessibility/event/name-change-expected-win.txt

-EVENT_OBJECT_NAMECHANGE on <h1#a> role=H1 name="After"
+EVENT_OBJECT_NAMECHANGE on <h1#a> role=H1 name="After" level=1

content/test/data/accessibility/event/name-change-indirect-expected-win.txt

 EVENT_OBJECT_HIDE on role=ROLE_SYSTEM_STATICTEXT name="apples"
 EVENT_OBJECT_NAMECHANGE on <div> role=ROLE_SYSTEM_GROUPING name="oranges"
-EVENT_OBJECT_NAMECHANGE on <h1#title> role=H1 name="oranges"
-EVENT_OBJECT_REORDER on <h1#title> role=H1 name="oranges"
+EVENT_OBJECT_NAMECHANGE on <h1#title> role=H1 name="oranges" level=1
+EVENT_OBJECT_REORDER on <h1#title> role=H1 name="oranges" level=1
 EVENT_OBJECT_SHOW on role=ROLE_SYSTEM_STATICTEXT name="oranges"
-IA2_EVENT_TEXT_INSERTED on <h1#title> role=H1 name="oranges" new_text={'orang' start=0 end=5}
-IA2_EVENT_TEXT_REMOVED on <h1#title> role=H1 name="oranges" old_text={'appl' start=0 end=4}
+IA2_EVENT_TEXT_INSERTED on <h1#title> role=H1 name="oranges" level=1 new_text={'orang' start=0 end=5}
+IA2_EVENT_TEXT_REMOVED on <h1#title> role=H1 name="oranges" level=1 old_text={'appl' start=0 end=4}

content/test/data/accessibility/event/remove-child-expected-win.txt

-EVENT_OBJECT_HIDE on <div#item3> role=ROLE_SYSTEM_LISTITEM name="Item 3"
+EVENT_OBJECT_HIDE on <div#item3> role=ROLE_SYSTEM_LISTITEM name="Item 3" 3 of 3
 EVENT_OBJECT_REORDER on <div> role=ROLE_SYSTEM_LIST
-IA2_EVENT_TEXT_REMOVED on <div> role=ROLE_SYSTEM_LIST old_text={'<obj>' start=2 end=3}
+IA2_EVENT_TEXT_REMOVED on <div> role=ROLE_SYSTEM_LIST old_text={'<obj>' start=2 end=3}
\ No newline at end of file

content/test/data/accessibility/event/remove-hidden-attribute-expected-win.txt

 EVENT_OBJECT_REORDER on <div> role=ROLE_SYSTEM_LIST
-EVENT_OBJECT_SHOW on <div#item3> role=ROLE_SYSTEM_LISTITEM name="Item 3"
-IA2_EVENT_TEXT_INSERTED on <div> role=ROLE_SYSTEM_LIST new_text={'<obj>' start=2 end=3}
+EVENT_OBJECT_SHOW on <div#item3> role=ROLE_SYSTEM_LISTITEM name="Item 3" 3 of 3
+IA2_EVENT_TEXT_INSERTED on <div> role=ROLE_SYSTEM_LIST new_text={'<obj>' start=2 end=3}
\ No newline at end of file

content/test/data/accessibility/event/remove-hidden-attribute-subtree-expected-win.txt

 EVENT_OBJECT_REORDER on <ul> role=ROLE_SYSTEM_LIST
-EVENT_OBJECT_SHOW on <li#item3> role=ROLE_SYSTEM_LISTITEM
-IA2_EVENT_TEXT_INSERTED on <ul> role=ROLE_SYSTEM_LIST new_text={'<obj>' start=2 end=3}
+EVENT_OBJECT_SHOW on <li#item3> role=ROLE_SYSTEM_LISTITEM 3 of 3
+IA2_EVENT_TEXT_INSERTED on <ul> role=ROLE_SYSTEM_LIST new_text={'<obj>' start=2 end=3}
\ No newline at end of file

content/test/data/accessibility/event/text-changed-expected-win.txt

@@ -3,7 +3,7 @@ EVENT_OBJECT_NAMECHANGE on role=ROLE_SYSTEM_STATICTEXT name="Modified Heading"
 EVENT_OBJECT_NAMECHANGE on role=ROLE_SYSTEM_STATICTEXT name="Text modified"
 EVENT_OBJECT_SHOW on role=ROLE_SYSTEM_STATICTEXT name="Modified Para"
 IA2_EVENT_TEXT_INSERTED on <div> role=DIV name="div" new_text={'Text modified' start=0 end=13}
-IA2_EVENT_TEXT_INSERTED on <h2#h> role=H2 name="Heading" new_text={'Modified ' start=0 end=9}
+IA2_EVENT_TEXT_INSERTED on <h2#h> role=H2 name="Heading" level=2 new_text={'Modified ' start=0 end=9}
 IA2_EVENT_TEXT_INSERTED on <p#p> role=P new_text={'Modified ' start=0 end=9}
 IA2_EVENT_TEXT_INSERTED on role=ROLE_SYSTEM_STATICTEXT name="Modified Heading" new_text={'Modified ' start=0 end=9}
 IA2_EVENT_TEXT_INSERTED on role=ROLE_SYSTEM_STATICTEXT name="Text modified" new_text={'Text modified' start=0 end=13}