Skip to content

GitLab

T
tangled
Commit 14ef2a6b authored by Chris Pickel's avatar Chris Pickel Committed by Commit Bot
Browse files
Options

Revert "Force updates to related nodes" 

This reverts commit f0baa069.

Reason for revert: "BackgroundTest.ActiveDescendantUpdates" is flaky. Since it appears to have been added in this CL, reverting for dtseng to take another look.

Original change's description:
> Force updates to related nodes
> 
> Test: chromevox_tests. Prior to the change,
> BackgroundTest.ActiveDescendantUpdates fails because 'Selected' is not spoken.
> 
> Compute text content for list items without names
> 
> Chrome doesn't compute descendant name on focus.
> 
> Test: manually on twitter.com using j/k. Verify all text gets read.
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Change-Id: Ie75dff41f98b8aa3904e435afa4bd245b9771cce
> Reviewed-on: https://chromium-review.googlesource.com/891676
> Commit-Queue: David Tseng <dtseng@chromium.org>
> Reviewed-by: Nektarios Paisios <nektar@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#533960}

TBR=dtseng@chromium.org,nektar@chromium.org

Bug: 808337
Change-Id: I4f838f27aa81a607bcb83934bec0dc321d336466
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Reviewed-on: https://chromium-review.googlesource.com/897789Reviewed-by: default avatarChris Pickel <sfiera@chromium.org>
Commit-Queue: Chris Pickel <sfiera@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534006}
parent c2688275
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 55 deletions
chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
View file @ 14ef2a6b
......@@ -1434,35 +1434,3 @@ TEST_F('BackgroundTest', 'TableColumnHeaders', function() {
.replay();
});
});
TEST_F('BackgroundTest', 'ActiveDescendantUpdates', function() {
var mockFeedback = this.createMockFeedback();
this.runWithLoadedTree(function(root) {/*!
<div aria-label="container" tabindex=0 role="group" id="active"
aria-activedescendant="1">
<div id="1" role="treeitem"></div>
<div id="2" role="treeitem"></div>
<script>
var alt = false;
var active = document.getElementById('active');
var one = document.getElementById('1');
var two = document.getElementById('2');
active.addEventListener('click', function() {
var sel = alt ? one : two;
var unsel = alt ? two : one;
active.setAttribute('aria-activedescendant', sel.id);
sel.setAttribute('aria-selected', true);
unsel.setAttribute('aria-selected', false);
alt = !alt;
});
</script>
*/}, function(root) {
var group = root.firstChild;
mockFeedback.call(group.focus.bind(group))
.call(group.doDefault.bind(group))
.expectSpeech('Tree item', 'Selected', ' 2 of 2 ')
.call(group.doDefault.bind(group))
.expectSpeech('Tree item', 'Selected', ' 1 of 2 ')
.replay();
});
});
content/renderer/accessibility/render_accessibility_impl.cc
View file @ 14ef2a6b
......@@ -299,13 +299,6 @@ void RenderAccessibilityImpl::HandleAXEvent(const blink::WebAXObject& obj,
}
}
// The event target's relations, which may not be descendants, need to be
// picked up by the serializer as well. See https://crbug.com/808061. below.
if (!obj.AriaActiveDescendant().IsDetached()) {
HandleAXEvent(obj.AriaActiveDescendant(),
ax::mojom::Event::kChildrenChanged);
}
// Add the accessibility object to our cache and ensure it's valid.
AccessibilityHostMsg_EventParams acc_event;
acc_event.id = obj.AxID();
......
content/test/data/accessibility/event/aria-combo-box-expand-expected-mac.txt
View file @ 14ef2a6b
AXSelectedChildrenChanged on AXComboBox
AXExpandedChanged on AXComboBox
AXSelectedChildrenChanged on AXList
\ No newline at end of file
AXExpandedChanged on AXComboBox
\ No newline at end of file
content/test/data/accessibility/event/aria-combo-box-expand-expected-win.txt
View file @ 14ef2a6b
EVENT_OBJECT_STATECHANGE on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSABLE,SELECTABLE
EVENT_OBJECT_SELECTION on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" SELECTED,FOCUSABLE,SELECTABLE
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_FOCUS 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_SELECTIONWITHIN on <ul#list> role=ROLE_SYSTEM_LIST IA2_STATE_VERTICAL
\ No newline at end of file
EVENT_OBJECT_FOCUS on <li#option1> role=ROLE_SYSTEM_LISTITEM name="Apple" 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
\ No newline at end of file
content/test/data/accessibility/event/aria-combo-box-next-expected-mac.txt
View file @ 14ef2a6b
AXSelectedChildrenChanged on AXComboBox
AXSelectedChildrenChanged on AXList
\ No newline at end of file
AXSelectedChildrenChanged on AXComboBox
\ No newline at end of file
content/test/data/accessibility/event/aria-combo-box-next-expected-win.txt
View file @ 14ef2a6b
EVENT_OBJECT_STATECHANGE on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" SELECTED,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
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_SELECTIONWITHIN on <ul#list> role=ROLE_SYSTEM_LIST IA2_STATE_VERTICAL
\ No newline at end of file
EVENT_OBJECT_FOCUS on <li#option3> role=ROLE_SYSTEM_LISTITEM name="Banana" 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
\ No newline at end of file
content/test/data/accessibility/event/aria-treeitem-focus-expected-mac.txt
View file @ 14ef2a6b
AXFocusedUIElementChanged on AXRow AXTitle="Minor Ninth"
AXSelectedRowsChanged on AXOutline
AXSelectedChildrenChanged on AXOutline
\ No newline at end of file
content/test/data/accessibility/event/checked-state-changed-expected-mac.txt
View file @ 14ef2a6b
AXValueChanged on AXCheckBox AXDescription="My Checkbox"
AXValueChanged on AXRow AXTitle="Treeitem"
\ No newline at end of file
AXValueChanged on AXRow AXTitle="Treeitem"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment