Skip to content

GitLab

T
tangled
Commit aab190c8 authored by dtseng@chromium.org's avatar dtseng@chromium.org
Browse files
Options

Correctly map list markers to a specific role rather than a generic group on Mac. 


BUG=122238
TEST=manually with VoiceOver.


Review URL: http://codereview.chromium.org/10054037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132231 0039d316-1c4b-4281-b951-d872f2087c98
parent e7d6ec85
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 9 deletions
chrome/browser/accessibility/accessibility_win_browsertest.cc
View file @ aab190c8
......@@ -446,7 +446,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
tree_updated_observer1.Wait();
// Check the browser's copy of the renderer accessibility tree.
AccessibleChecker list_marker_checker(L"", ROLE_SYSTEM_TEXT, L"\x2022");
AccessibleChecker list_marker_checker(L"\x2022", ROLE_SYSTEM_TEXT, L"");
AccessibleChecker static_text_checker(L"li", ROLE_SYSTEM_TEXT, L"");
AccessibleChecker list_item_checker(L"", ROLE_SYSTEM_LISTITEM, L"");
list_item_checker.SetExpectedState(
......
content/browser/accessibility/browser_accessibility_cocoa.mm
View file @ aab190c8
......@@ -138,7 +138,7 @@ RoleMap BuildRoleMap() {
{ WebAccessibility::ROLE_LINK, NSAccessibilityLinkRole },
{ WebAccessibility::ROLE_LIST, NSAccessibilityListRole },
{ WebAccessibility::ROLE_LIST_ITEM, NSAccessibilityGroupRole },
{ WebAccessibility::ROLE_LIST_MARKER, NSAccessibilityGroupRole },
{ WebAccessibility::ROLE_LIST_MARKER, @"AXListMarker" },
{ WebAccessibility::ROLE_LISTBOX, NSAccessibilityListRole },
{ WebAccessibility::ROLE_LISTBOX_OPTION, NSAccessibilityGroupRole },
{ WebAccessibility::ROLE_LOG, NSAccessibilityGroupRole },
......
content/browser/accessibility/browser_accessibility_win.cc
View file @ aab190c8
......@@ -2713,7 +2713,8 @@ void BrowserAccessibilityWin::PreInitialize() {
if (name_.empty() &&
(role_ == WebAccessibility::ROLE_LISTBOX_OPTION ||
role_ == WebAccessibility::ROLE_STATIC_TEXT)) {
role_ == WebAccessibility::ROLE_STATIC_TEXT ||
role_ == WebAccessibility::ROLE_LIST_MARKER)) {
name_.swap(value_);
}
......
content/test/data/accessibility/list-markers-expected-mac.txt 0 → 100644
View file @ aab190c8
AXWebArea subrole=(null) roleDescription='HTML content' title='' value=''
AXList subrole=AXContentList roleDescription='list' title='' value=''
AXGroup subrole=(null) roleDescription='group' title='' value=''
AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•'
AXStaticText subrole=(null) roleDescription='text' title='' value='First item properly groups itself despite '
AXStaticText subrole=(null) roleDescription='text' title='' value='bolded'
AXStaticText subrole=(null) roleDescription='text' title='' value=' text.'
AXGroup subrole=(null) roleDescription='group' title='' value=''
AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•'
AXStaticText subrole=(null) roleDescription='text' title='' value='This should also be '
AXStaticText subrole=(null) roleDescription='text' title='' value='seen'
AXStaticText subrole=(null) roleDescription='text' title='' value=' as a group.'
AXGroup subrole=(null) roleDescription='group' title='' value=''
AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•'
AXStaticText subrole=(null) roleDescription='text' title='' value='Some '
AXStaticText subrole=(null) roleDescription='text' title='' value='more'
AXStaticText subrole=(null) roleDescription='text' title='' value=' text.'
content/test/data/accessibility/list-markers.html 0 → 100644
View file @ aab190c8
<html>
<body>
<ul>
<li> First item properly groups itself despite <b>bolded</b> text.
<li>This should also be <i>seen</i> as a group.
<li> Some <strong>more</strong> text.
<!-- Omission of closing ul as seen in live site -->
</body>
</html>
content/test/data/accessibility/ul-expected-mac.txt
View file @ aab190c8
AXWebArea subrole=(null) roleDescription='HTML content' title='' value=''
AXList subrole=AXContentList roleDescription='list' title='' value=''
AXGroup subrole=(null) roleDescription='group' title='' value=''
AXGroup subrole=(null) roleDescription='group' title='' value='•'
AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•'
AXStaticText subrole=(null) roleDescription='text' title='' value='Item 1'
AXGroup subrole=(null) roleDescription='group' title='' value=''
AXGroup subrole=(null) roleDescription='group' title='' value='•'
AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•'
AXStaticText subrole=(null) roleDescription='text' title='' value='Item 2'
AXGroup subrole=(null) roleDescription='group' title='' value=''
AXGroup subrole=(null) roleDescription='group' title='' value='•'
AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•'
AXStaticText subrole=(null) roleDescription='text' title='' value='Item 3'
content/test/data/accessibility/ul-expected-win.txt
View file @ aab190c8
ROLE_SYSTEM_DOCUMENT name='' state=FOCUSED,READONLY,FOCUSABLE
ROLE_SYSTEM_LIST name='' state=READONLY
ROLE_SYSTEM_LISTITEM name='' state=READONLY
ROLE_SYSTEM_TEXT name='' state=READONLY
ROLE_SYSTEM_TEXT name='•' state=READONLY
ROLE_SYSTEM_TEXT name='Item 1' state=READONLY
ROLE_SYSTEM_LISTITEM name='' state=READONLY
ROLE_SYSTEM_TEXT name='' state=READONLY
ROLE_SYSTEM_TEXT name='•' state=READONLY
ROLE_SYSTEM_TEXT name='Item 2' state=READONLY
ROLE_SYSTEM_LISTITEM name='' state=READONLY
ROLE_SYSTEM_TEXT name='' state=READONLY
ROLE_SYSTEM_TEXT name='•' state=READONLY
ROLE_SYSTEM_TEXT name='Item 3' state=READONLY
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