[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:14:05 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit cf30671e6e1608c8170e25766a927900d0cef1f9
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 29 02:48:19 2009 +0000
WebCore: WAI-ARIA: add support for 'option' role
https://bugs.webkit.org/show_bug.cgi?id=30843
Reviewed by Darin Adler.
Test: accessibility/aria-option-role.html
* accessibility/AccessibilityListBoxOption.h:
(WebCore::AccessibilityListBoxOption::canHaveChildren):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::RoleEntry::):
(WebCore::AccessibilityRenderObject::canHaveChildren):
LayoutTests: Fix video-pause-immediately.html to avoid using setTimeout().
Patch by Andrew Scherkus <scherkus at chromium.org> on 2009-10-28
Reviewed by Eric Carlson.
This also addresses the flakiness on Windows, where 200ms was not enough time to advance the clock past zero.
https://bugs.webkit.org/show_bug.cgi?id=30889
* media/video-pause-immediately.html: Replace setTimeout() with timeupdate events.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50256 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ec5fec6..5220076 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -145,6 +145,18 @@
2009-10-27 Chris Fleizach <cfleizach at apple.com>
+ Reviewed by Darin Adler.
+
+ WAI-ARIA: add support for 'option' role
+ https://bugs.webkit.org/show_bug.cgi?id=30843
+
+ * accessibility/aria-option-role.html: Added.
+ * platform/gtk/Skipped:
+ * platform/mac/accessibility/aria-option-role-expected.txt: Added.
+ * platform/win/Skipped:
+
+2009-10-27 Chris Fleizach <cfleizach at apple.com>
+
No review.
ARIA menu/menu item need AXRoleDescription
diff --git a/LayoutTests/accessibility/aria-option-role.html b/LayoutTests/accessibility/aria-option-role.html
new file mode 100644
index 0000000..71faf5b
--- /dev/null
+++ b/LayoutTests/accessibility/aria-option-role.html
@@ -0,0 +1,47 @@
+<!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 role="listbox">
+<div role="option">option 1</div>
+<div role="option" title="label 2">option 2</div>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that the aria 'option' role works as expected. That is, it becomes a static text element with no children.");
+
+ if (window.accessibilityController) {
+
+ var body = document.getElementById("body");
+ body.focus();
+
+ var listBox = accessibilityController.focusedElement.childAtIndex(0);
+ var firstChild = listBox.childAtIndex(0);
+ var secondChild = listBox.childAtIndex(1);
+ shouldBe("firstChild.role", "'AXRole: AXStaticText'");
+ shouldBe("firstChild.title", "'AXTitle: option 1'");
+
+ shouldBe("secondChild.role", "'AXRole: AXStaticText'");
+ shouldBe("secondChild.title", "'AXTitle: label 2'");
+
+ shouldBe("firstChild.childrenCount", "0");
+ shouldBe("secondChild.childrenCount", "0");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index ab77a48..868db88 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -59,6 +59,7 @@ accessibility/input-slider.html
accessibility/language-attribute.html
accessibility/media-element.html
accessibility/onclick-handlers.html
+accessibility/aria-option-role.html
accessibility/placeholder.html
accessibility/radio-button-title-label.html
accessibility/secure-textfield-title-ui.html
diff --git a/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt b/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt
new file mode 100644
index 0000000..d75949a
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt
@@ -0,0 +1,17 @@
+option 1
+option 2
+This tests that the aria 'option' role works as expected. That is, it becomes a static text element with no children.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS firstChild.role is 'AXRole: AXStaticText'
+PASS firstChild.title is 'AXTitle: option 1'
+PASS secondChild.role is 'AXRole: AXStaticText'
+PASS secondChild.title is 'AXTitle: label 2'
+PASS firstChild.childrenCount is 0
+PASS secondChild.childrenCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 4237c70..2bc6bce 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -383,6 +383,7 @@ accessibility/nochildren-elements.html
accessibility/non-data-table-cell-title-ui-element.html
accessibility/non-native-image-crash.html
accessibility/onclick-handlers.html
+accessibility/aria-option-role.html
accessibility/placeholder.html
accessibility/plugin.html
accessibility/radio-button-checkbox-size.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a21dbf6..1727089 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-27 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ WAI-ARIA: add support for 'option' role
+ https://bugs.webkit.org/show_bug.cgi?id=30843
+
+ Test: accessibility/aria-option-role.html
+
+ * accessibility/AccessibilityListBoxOption.h:
+ (WebCore::AccessibilityListBoxOption::canHaveChildren):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::RoleEntry::):
+ (WebCore::AccessibilityRenderObject::canHaveChildren):
+
2009-10-28 Jens Alfke <snej at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/accessibility/AccessibilityListBoxOption.h b/WebCore/accessibility/AccessibilityListBoxOption.h
index 1b588cd..933cdeb 100644
--- a/WebCore/accessibility/AccessibilityListBoxOption.h
+++ b/WebCore/accessibility/AccessibilityListBoxOption.h
@@ -68,6 +68,7 @@ public:
private:
HTMLElement* m_optionElement;
+ virtual bool canHaveChildren() const { return false; }
HTMLSelectElement* listBoxOptionParentNode() const;
int listBoxOptionIndex() const;
IntRect listBoxOptionRect() const;
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index fc8a5f0..4c50b9a 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2289,6 +2289,7 @@ static const ARIARoleMap& createARIARoleMap()
{ "menuitemradio", MenuItemRole },
{ "note", DocumentNoteRole },
{ "navigation", LandmarkNavigationRole },
+ { "option", ListBoxOptionRole },
{ "presentation", IgnoredRole },
{ "progressbar", ProgressIndicatorRole },
{ "radio", RadioButtonRole },
@@ -2535,6 +2536,8 @@ bool AccessibilityRenderObject::canHaveChildren() const
case PopUpButtonRole:
case CheckBoxRole:
case RadioButtonRole:
+ case StaticTextRole:
+ case ListBoxOptionRole:
return false;
default:
return true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list