[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
jhoneycutt at apple.com
jhoneycutt at apple.com
Thu Apr 8 01:02:46 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit f97e664e7180d7cdd9c69b7785625ce9badb0725
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 12 22:07:21 2010 +0000
MSAA: Accessibility role of <select multiple> elements is wrong
https://bugs.webkit.org/show_bug.cgi?id=33522
Reviewed by Darin Adler.
WebKit/win:
* AccessibleBase.cpp:
(MSAARole):
Map the WebCore::ListBox and WebCore::ListBoxOption roles to the MSAA
"list" and "list item" roles.
LayoutTests:
* platform/win/accessibility/multiple-select-element-role-expected.txt: Added.
* platform/win/accessibility/multiple-select-element-role.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53163 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1d99b91..92edb32 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-11 Jon Honeycutt <jhoneycutt at apple.com>
+
+ MSAA: Accessibility role of <select multiple> elements is wrong
+
+ https://bugs.webkit.org/show_bug.cgi?id=33522
+
+ Reviewed by Darin Adler.
+
+ * platform/win/accessibility/multiple-select-element-role-expected.txt: Added.
+ * platform/win/accessibility/multiple-select-element-role.html: Added.
+
2010-01-12 Beth Dakin <bdakin at apple.com>
Reviewed by Nikolas Zimmermann.
diff --git a/LayoutTests/platform/win/accessibility/multiple-select-element-role-expected.txt b/LayoutTests/platform/win/accessibility/multiple-select-element-role-expected.txt
new file mode 100644
index 0000000..ac66481
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/multiple-select-element-role-expected.txt
@@ -0,0 +1,7 @@
+This tests the accessibility roles of multiselect elements and their option elements.
+
+PASS accessibilityController.focusedElement.role is "list"
+PASS accessibilityController.focusedElement.childAtIndex(0).role is "list item"
+
+
+
diff --git a/LayoutTests/platform/win/accessibility/multiple-select-element-role.html b/LayoutTests/platform/win/accessibility/multiple-select-element-role.html
new file mode 100644
index 0000000..870faa7
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/multiple-select-element-role.html
@@ -0,0 +1,34 @@
+<html>
+<head>
+ <link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+ <script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+
+<body id="body">
+
+<p>This tests the accessibility roles of multiselect elements and their option
+elements.</p>
+
+<p id="console"></p>
+
+<p id="notDRT">This test should only be run inside of DumpRenderTree.</p>
+
+<select id="selectElement" multiple title="selectElement">
+ <option SELECTED>Option 1</option>
+ <option>Option 2</option>
+ <option>Option 3</option>
+</select>
+
+<script>
+ if (window.layoutTestController && window.accessibilityController) {
+ document.getElementById("notDRT").style.visibility = "hidden";
+
+ layoutTestController.dumpAsText();
+
+ document.getElementById("selectElement").focus();
+ shouldBe('accessibilityController.focusedElement.role', '"list"');
+ shouldBe('accessibilityController.focusedElement.childAtIndex(0).role', '"list item"');
+ }
+</script>
+</body>
+</html>
diff --git a/WebKit/win/AccessibleBase.cpp b/WebKit/win/AccessibleBase.cpp
index 90818b5..c03f235 100644
--- a/WebKit/win/AccessibleBase.cpp
+++ b/WebKit/win/AccessibleBase.cpp
@@ -556,6 +556,7 @@ static long MSAARole(AccessibilityRole role)
case WebCore::GroupRole:
return ROLE_SYSTEM_GROUPING;
case WebCore::ListRole:
+ case WebCore::ListBoxRole:
return ROLE_SYSTEM_LIST;
case WebCore::TableRole:
return ROLE_SYSTEM_TABLE;
@@ -566,6 +567,7 @@ static long MSAARole(AccessibilityRole role)
case WebCore::ImageRole:
return ROLE_SYSTEM_GRAPHIC;
case WebCore::ListItemRole:
+ case WebCore::ListBoxOptionRole:
return ROLE_SYSTEM_LISTITEM;
case WebCore::PopUpButtonRole:
return ROLE_SYSTEM_COMBOBOX;
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 1561225..9e3569e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-11 Jon Honeycutt <jhoneycutt at apple.com>
+
+ MSAA: Accessibility role of <select multiple> elements is wrong
+
+ https://bugs.webkit.org/show_bug.cgi?id=33522
+
+ Reviewed by Darin Adler.
+
+ * AccessibleBase.cpp:
+ (MSAARole):
+ Map the WebCore::ListBox and WebCore::ListBoxOption roles to the MSAA
+ "list" and "list item" roles.
+
2010-01-08 Brent Fulgham <bfulgham at webkit.org>
Build fix, no review.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list