[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
cfleizach at apple.com
cfleizach at apple.com
Wed Apr 7 23:11:07 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7f5af79ead7d3143e708d01b369e3b694c7ed706
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 28 03:39:26 2009 +0000
WAI-ARIA: add support for 'presentation' role
https://bugs.webkit.org/show_bug.cgi?id=30806
Reviewed by Adele Peterson.
WebCore:
Test: accessibility/aria-presentational-role.html
* accessibility/AccessibilityObject.h:
(WebCore::):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
(WebCore::RoleEntry::):
LayoutTests:
* accessibility/aria-presentational-role-expected.txt: Added.
* accessibility/aria-presentational-role.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50196 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 64a503d..e6e062e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
2009-10-27 Chris Fleizach <cfleizach at apple.com>
+ Reviewed by Adele Peterson.
+
+ WAI-ARIA: add support for 'presentation' role
+ https://bugs.webkit.org/show_bug.cgi?id=30806
+
+ * accessibility/aria-presentational-role-expected.txt: Added.
+ * accessibility/aria-presentational-role.html: Added.
+
+2009-10-27 Chris Fleizach <cfleizach at apple.com>
+
Reviewed by Darin Adler.
ARIA menu/menu item need AXRoleDescription
diff --git a/LayoutTests/accessibility/aria-presentational-role-expected.txt b/LayoutTests/accessibility/aria-presentational-role-expected.txt
new file mode 100644
index 0000000..17fb1b8
--- /dev/null
+++ b/LayoutTests/accessibility/aria-presentational-role-expected.txt
@@ -0,0 +1,12 @@
+Link and text
+
+This tests that the aria 'presentation' role works by successfully removing the element from the AX tree.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS firstChild.role is 'AXRole: AXLink'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/accessibility/aria-presentational-role.html b/LayoutTests/accessibility/aria-presentational-role.html
new file mode 100644
index 0000000..2e3632f
--- /dev/null
+++ b/LayoutTests/accessibility/aria-presentational-role.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<h3 role="presentation">
+<a href="#">Link</a> and text
+</h3>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that the aria 'presentation' role works by successfully removing the element from the AX tree.");
+
+ if (window.accessibilityController) {
+
+ var body = document.getElementById("body");
+ body.focus();
+
+ var firstChild = accessibilityController.focusedElement.childAtIndex(0);
+ shouldBe("firstChild.role", "'AXRole: AXLink'");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 858c65d..2460d17 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
2009-10-27 Chris Fleizach <cfleizach at apple.com>
+ Reviewed by Adele Peterson.
+
+ WAI-ARIA: add support for 'presentation' role
+ https://bugs.webkit.org/show_bug.cgi?id=30806
+
+ Test: accessibility/aria-presentational-role.html
+
+ * accessibility/AccessibilityObject.h:
+ (WebCore::):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
+ (WebCore::RoleEntry::):
+
+2009-10-27 Chris Fleizach <cfleizach at apple.com>
+
Reviewed by Darin Adler.
ARIA menu/menu item need AXRoleDescription
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index 6211293..f822df9 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -160,6 +160,7 @@ enum AccessibilityRole {
DefinitionListDefinitionRole,
AnnotationRole,
SliderThumbRole,
+ IgnoredRole,
// ARIA Grouping roles
LandmarkApplicationRole,
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 4072541..65742fe 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1272,6 +1272,9 @@ bool AccessibilityRenderObject::accessibilityIsIgnored() const
if (isPresentationalChildOfAriaRole())
return true;
+ if (roleValue() == IgnoredRole)
+ return true;
+
// ignore popup menu items because AppKit does
for (RenderObject* parent = m_renderer->parent(); parent; parent = parent->parent()) {
if (parent->isMenuList())
@@ -2282,6 +2285,7 @@ static const ARIARoleMap& createARIARoleMap()
{ "menuitemradio", MenuItemRole },
{ "note", DocumentNoteRole },
{ "navigation", LandmarkNavigationRole },
+ { "presentation", IgnoredRole },
{ "progressbar", ProgressIndicatorRole },
{ "radio", RadioButtonRole },
{ "radiogroup", RadioGroupRole },
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list