Diff
Modified: branches/safari-537.73-branch/LayoutTests/ChangeLog (158410 => 158411)
--- branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-11-01 00:31:27 UTC (rev 158410)
+++ branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-11-01 00:35:53 UTC (rev 158411)
@@ -1,3 +1,22 @@
+2013-10-31 Lucas Forschler <[email protected]>
+
+ Merge r157183
+
+ 2013-10-09 Chris Fleizach <[email protected]>
+
+ AX: VoiceOver double speaks all items in <li> nodes
+ https://bugs.webkit.org/show_bug.cgi?id=122564
+
+ Reviewed by Brent Fulgham.
+
+ Make a mac specific expectation for listitem-title on Mac.
+ Make a more directed test for Mac regarding listitem labeling.
+
+ * platform/mac/accessibility/lists-expected.txt:
+ * platform/mac/accessibility/listitem-title-expected.txt: Added.
+ * platform/mac/accessibility/native-list-item-should-not-expose-label-expected.txt: Added.
+ * platform/mac/accessibility/native-list-item-should-not-expose-label.html: Added.
+
2013-10-28 Lucas Forschler <[email protected]>
Merge r157298
Modified: branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/lists-expected.txt (158410 => 158411)
--- branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/lists-expected.txt 2013-11-01 00:31:27 UTC (rev 158410)
+++ branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/lists-expected.txt 2013-11-01 00:35:53 UTC (rev 158411)
@@ -152,22 +152,22 @@
AXRoleDescription: group
AXChildren: <array of size 2>
AXHelp:
-AXParent: <AXGroup: 'test 1'>
+AXParent: <AXGroup>
AXSize: NSSize: {729, 18}
-AXTitle: test 1
+AXTitle:
AXDescription:
AXValue:
AXFocused: 0
AXEnabled: 1
-AXWindow: <AXGroup: 'test 1'>
+AXWindow: <AXGroup>
AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXGroup: 'test 1'>
-AXEndTextMarker: <AXGroup: 'test 1'>
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
AXVisited: 0
AXLinkedUIElements: (null)
AXSelected: 0
AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXGroup: 'test 1'>
+AXTopLevelUIElement: <AXGroup>
AXTitleUIElement: (null)
AXARIABusy: 0
@@ -177,22 +177,22 @@
AXRoleDescription: group
AXChildren: <array of size 2>
AXHelp:
-AXParent: <AXGroup: 'test 2'>
+AXParent: <AXGroup>
AXSize: NSSize: {729, 18}
-AXTitle: test 2
+AXTitle:
AXDescription:
AXValue:
AXFocused: 0
AXEnabled: 1
-AXWindow: <AXGroup: 'test 2'>
+AXWindow: <AXGroup>
AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXGroup: 'test 2'>
-AXEndTextMarker: <AXGroup: 'test 2'>
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
AXVisited: 0
AXLinkedUIElements: (null)
AXSelected: 0
AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXGroup: 'test 2'>
+AXTopLevelUIElement: <AXGroup>
AXTitleUIElement: (null)
AXARIABusy: 0
@@ -204,22 +204,22 @@
AXRoleDescription: group
AXChildren: <array of size 2>
AXHelp:
-AXParent: <AXGroup: 'test 1'>
+AXParent: <AXGroup>
AXSize: NSSize: {729, 18}
-AXTitle: test 1
+AXTitle:
AXDescription:
AXValue:
AXFocused: 0
AXEnabled: 1
-AXWindow: <AXGroup: 'test 1'>
+AXWindow: <AXGroup>
AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXGroup: 'test 1'>
-AXEndTextMarker: <AXGroup: 'test 1'>
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
AXVisited: 0
AXLinkedUIElements: (null)
AXSelected: 0
AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXGroup: 'test 1'>
+AXTopLevelUIElement: <AXGroup>
AXTitleUIElement: (null)
AXARIABusy: 0
@@ -229,22 +229,22 @@
AXRoleDescription: group
AXChildren: <array of size 2>
AXHelp:
-AXParent: <AXGroup: 'test 2'>
+AXParent: <AXGroup>
AXSize: NSSize: {729, 18}
-AXTitle: test 2
+AXTitle:
AXDescription:
AXValue:
AXFocused: 0
AXEnabled: 1
-AXWindow: <AXGroup: 'test 2'>
+AXWindow: <AXGroup>
AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXGroup: 'test 2'>
-AXEndTextMarker: <AXGroup: 'test 2'>
+AXStartTextMarker: <AXGroup>
+AXEndTextMarker: <AXGroup>
AXVisited: 0
AXLinkedUIElements: (null)
AXSelected: 0
AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXGroup: 'test 2'>
+AXTopLevelUIElement: <AXGroup>
AXTitleUIElement: (null)
AXARIABusy: 0
Copied: branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label-expected.txt (from rev 157183, trunk/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label-expected.txt) (0 => 158411)
--- branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label-expected.txt (rev 0)
+++ branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label-expected.txt 2013-11-01 00:35:53 UTC (rev 158411)
@@ -0,0 +1,12 @@
+Some text. Like
+This tests that list items on MacOS do not expose labeling information. MacOS expects only leaf-node type elements to do that.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS listitem.description is 'AXDescription: '
+PASS listitem.title is 'AXTitle: '
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label.html (from rev 157183, trunk/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label.html) (0 => 158411)
--- branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label.html (rev 0)
+++ branches/safari-537.73-branch/LayoutTests/platform/mac/accessibility/native-list-item-should-not-expose-label.html 2013-11-01 00:35:53 UTC (rev 158411)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body id="body">
+
+<ul>
+ <li id="listitem">
+ Some text.
+ <a href="" role="button">Like</a>
+ </li>
+</ul>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that list items on MacOS do not expose labeling information. MacOS expects only leaf-node type elements to do that.");
+
+ if (window.accessibilityController) {
+
+ // Both the title and description should be empty for the list item.
+ var listitem = accessibilityController.accessibleElementById("listitem");
+ shouldBe("listitem.description", "'AXDescription: '");
+ shouldBe("listitem.title", "'AXTitle: '");
+ }
+
+</script>
+
+<script src=""
+</body>
+</html>
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158410 => 158411)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-01 00:31:27 UTC (rev 158410)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-01 00:35:53 UTC (rev 158411)
@@ -1,5 +1,21 @@
2013-10-31 Lucas Forschler <[email protected]>
+ Merge r157183
+
+ 2013-10-09 Chris Fleizach <[email protected]>
+
+ AX: VoiceOver double speaks all items in <li> nodes
+ https://bugs.webkit.org/show_bug.cgi?id=122564
+
+ Reviewed by Brent Fulgham.
+
+ Test: platform/mac/accessibility/native-list-item-should-not-expose-label.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::visibleText):
+
+2013-10-31 Lucas Forschler <[email protected]>
+
Merge r157056
2013-10-07 Tim Horton <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (158410 => 158411)
--- branches/safari-537.73-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-11-01 00:31:27 UTC (rev 158410)
+++ branches/safari-537.73-branch/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-11-01 00:35:53 UTC (rev 158411)
@@ -1262,7 +1262,10 @@
case ToggleButtonRole:
case CheckBoxRole:
case ListBoxOptionRole:
+ // MacOS does not expect native <li> elements to expose label information, it only expects leaf node elements to do that.
+#if !PLATFORM(MAC)
case ListItemRole:
+#endif
case MenuButtonRole:
case MenuItemRole:
case RadioButtonRole:
