[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:42:21 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 8d7d03f8f078b11c0addc89bfe8ff8a855a111d1
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 16 02:05:24 2009 +0000
Need to implement ARIA role="directory"
https://bugs.webkit.org/show_bug.cgi?id=31516
Reviewed by Darin Adler.
WebCore:
Test: platform/mac/accessibility/aria-directory.html
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::getOrCreate):
* accessibility/AccessibilityList.cpp:
(WebCore::AccessibilityList::isOrderedList):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::createARIARoleMap):
WebKit/mac:
Fix a spelling error in the comment of a localized (accessibility) string.
* WebCoreSupport/WebViewFactory.mm:
(-[WebViewFactory AXARIAContentGroupText:]):
LayoutTests:
* platform/mac/accessibility/aria-directory-expected.txt: Added.
* platform/mac/accessibility/aria-directory.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51007 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d8854fa..c16cb03 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-14 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Need to implement ARIA role="directory"
+ https://bugs.webkit.org/show_bug.cgi?id=31516
+
+ * platform/mac/accessibility/aria-directory-expected.txt: Added.
+ * platform/mac/accessibility/aria-directory.html: Added.
+
2009-11-14 Adele Peterson <adele at apple.com>
Reviewed by Dan Bernstein.
diff --git a/LayoutTests/platform/mac/accessibility/aria-directory-expected.txt b/LayoutTests/platform/mac/accessibility/aria-directory-expected.txt
new file mode 100644
index 0000000..da24fa9
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-directory-expected.txt
@@ -0,0 +1,14 @@
+Item 1
+Item 2
+Item 3
+This tests that ARIA directory is exposed correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS dir.role is 'AXRole: AXList'
+PASS dir.subrole is 'AXSubrole: AXContentList'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/aria-directory.html b/LayoutTests/platform/mac/accessibility/aria-directory.html
new file mode 100644
index 0000000..8562f94
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-directory.html
@@ -0,0 +1,39 @@
+<!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">
+
+<div tabindex=0 id="directory" role="directory">
+<div>Item 1</div>
+<div>Item 2</div>
+<div>Item 3</div>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that ARIA directory is exposed correctly.");
+
+ if (window.accessibilityController) {
+
+ var dir = document.getElementById("directory");
+ dir.focus();
+ dir = accessibilityController.focusedElement;
+ shouldBe("dir.role", "'AXRole: AXList'");
+ shouldBe("dir.subrole", "'AXSubrole: AXContentList'");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e1fdedf..a64c143 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-14 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Need to implement ARIA role="directory"
+ https://bugs.webkit.org/show_bug.cgi?id=31516
+
+ Test: platform/mac/accessibility/aria-directory.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::getOrCreate):
+ * accessibility/AccessibilityList.cpp:
+ (WebCore::AccessibilityList::isOrderedList):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::createARIARoleMap):
+
2009-11-15 Dave Tapuska <dtapuska at rim.com>
Reviewed by George Staikos.
diff --git a/WebCore/accessibility/AXObjectCache.cpp b/WebCore/accessibility/AXObjectCache.cpp
index bfb4787..6ec325a 100644
--- a/WebCore/accessibility/AXObjectCache.cpp
+++ b/WebCore/accessibility/AXObjectCache.cpp
@@ -143,7 +143,7 @@ AccessibilityObject* AXObjectCache::getOrCreate(RenderObject* renderer)
newObj = AccessibilityListBox::create(renderer);
// If the node is aria role="list" or the aria role is empty and its a ul/ol/dl type (it shouldn't be a list if aria says otherwise).
- else if (node && (nodeIsAriaType(node, "list")
+ else if (node && ((nodeIsAriaType(node, "list") || nodeIsAriaType(node, "directory"))
|| (nodeIsAriaType(node, nullAtom) && (node->hasTagName(ulTag) || node->hasTagName(olTag) || node->hasTagName(dlTag)))))
newObj = AccessibilityList::create(renderer);
diff --git a/WebCore/accessibility/AccessibilityList.cpp b/WebCore/accessibility/AccessibilityList.cpp
index f90fe0a..feceee5 100644
--- a/WebCore/accessibility/AccessibilityList.cpp
+++ b/WebCore/accessibility/AccessibilityList.cpp
@@ -87,7 +87,11 @@ bool AccessibilityList::isOrderedList() const
{
if (!m_renderer)
return false;
-
+
+ // ARIA says a directory is like a static table of contents, which sounds like an ordered list.
+ if (ariaRoleAttribute() == DirectoryRole)
+ return true;
+
Node* node = m_renderer->node();
return node && node->hasTagName(olTag);
}
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index 9e8c7cd..267a1df 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -166,6 +166,7 @@ enum AccessibilityRole {
TabPanelRole,
TreeRole,
TreeItemRole,
+ DirectoryRole,
// ARIA Grouping roles
LandmarkApplicationRole,
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index dd4912f..f01810b 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2443,6 +2443,7 @@ static const ARIARoleMap& createARIARoleMap()
{ "complementary", LandmarkComplementaryRole },
{ "contentinfo", LandmarkContentInfoRole },
{ "dialog", ApplicationDialogRole },
+ { "directory", DirectoryRole },
{ "grid", TableRole },
{ "gridcell", CellRole },
{ "columnheader", ColumnHeaderRole },
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index f76f352..5202b34 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -981,6 +981,7 @@ static const AccessibilityRoleMap& createAccessibilityRoleMap()
{ GroupRole, NSAccessibilityGroupRole },
{ RadioGroupRole, NSAccessibilityRadioGroupRole },
{ ListRole, NSAccessibilityListRole },
+ { DirectoryRole, NSAccessibilityListRole },
{ ScrollBarRole, NSAccessibilityScrollBarRole },
{ ValueIndicatorRole, NSAccessibilityValueIndicatorRole },
{ ImageRole, NSAccessibilityImageRole },
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 459aebb..733c0c8 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 6a96ecf..0345ca0 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-14 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Need to implement ARIA role="directory"
+ https://bugs.webkit.org/show_bug.cgi?id=31516
+
+ Fix a spelling error in the comment of a localized (accessibility) string.
+
+ * WebCoreSupport/WebViewFactory.mm:
+ (-[WebViewFactory AXARIAContentGroupText:]):
+
2009-11-14 Eric Carlson <eric.carlson at apple.com>
Reviewed by Oliver Hunt.
diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index 2c986fd..40822c9 100644
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -594,7 +594,7 @@
if ([ariaType isEqualToString:@"ARIAUserInterfaceTooltip"])
return UI_STRING("tooltip", "An ARIA accessibility group that acts as a tooltip.");
if ([ariaType isEqualToString:@"ARIATabPanel"])
- return UI_STRING("tab panel", "An ARIA accessibility group that contenst the content of a tab.");
+ return UI_STRING("tab panel", "An ARIA accessibility group that contains the content of a tab.");
return nil;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list