[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 00:43:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 382f270fc4e8353490167f6acd33da7fa21b73ae
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 19 00:05:59 2009 +0000
REGRESSION(r52233): MSAA: Accessibility role of lists is wrong
https://bugs.webkit.org/show_bug.cgi?id=32736
Reviewed by Adam Roben.
WebCore:
Test: platform/win/accessibility/list-role.html
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::roleValueForMSAA):
Return roleValue(), rather than m_role, as subclasses may override it.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::roleValueForMSAA):
Fallback to roleValue(), rather than m_role, as it may be overriden.
LayoutTests:
* platform/win/accessibility/list-role-expected.txt: Added.
* platform/win/accessibility/list-role.html: Added.
Verify that lists return the "list" role.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52352 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 56e7cde..acaee32 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-18 Jon Honeycutt <jhoneycutt at apple.com>
+
+ REGRESSION(r52233): MSAA: Accessibility role of lists is wrong
+
+ https://bugs.webkit.org/show_bug.cgi?id=32736
+
+ Reviewed by Adam Roben.
+
+ * platform/win/accessibility/list-role-expected.txt: Added.
+ * platform/win/accessibility/list-role.html: Added.
+ Verify that lists return the "list" role.
+
2009-12-17 Jon Honeycutt <jhoneycutt at apple.com>
MSAA: Accessibility role of list items is wrong
diff --git a/LayoutTests/platform/win/accessibility/list-role-expected.txt b/LayoutTests/platform/win/accessibility/list-role-expected.txt
new file mode 100644
index 0000000..cba0902
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/list-role-expected.txt
@@ -0,0 +1,7 @@
+This test verifies that, on Windows, lists return the "list" role.
+
+Bug 32736 - REGRESSION(r52233): MSAA: Accessibility role of lists is wrong
+
+list item
+PASS list.role is "list"
+
diff --git a/LayoutTests/platform/win/accessibility/list-role.html b/LayoutTests/platform/win/accessibility/list-role.html
new file mode 100644
index 0000000..530734f
--- /dev/null
+++ b/LayoutTests/platform/win/accessibility/list-role.html
@@ -0,0 +1,33 @@
+<html>
+ <head>
+ <link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+ <script src="../../../fast/js/resources/js-test-pre.js"></script>
+
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+ </head>
+ <body id="body">
+ <p>
+ This test verifies that, on Windows, lists return the "list" role.
+ <br><br>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=32736">Bug 32736 - REGRESSION(r52233): MSAA: Accessibility role of lists is wrong</a>
+ </p>
+
+ <ul id="list" tabindex=1>
+ <li>list item</li>
+ </ul>
+
+ <p id="console"></p>
+
+ <script>
+ if (window.accessibilityController) {
+ document.getElementById("list").focus();
+
+ var list = accessibilityController.focusedElement;
+ shouldBe('list.role', '"list"');
+ }
+ </script>
+ </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75eb379..3f27a29 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-18 Jon Honeycutt <jhoneycutt at apple.com>
+
+ REGRESSION(r52233): MSAA: Accessibility role of lists is wrong
+
+ https://bugs.webkit.org/show_bug.cgi?id=32736
+
+ Reviewed by Adam Roben.
+
+ Test: platform/win/accessibility/list-role.html
+
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::roleValueForMSAA):
+ Return roleValue(), rather than m_role, as subclasses may override it.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::roleValueForMSAA):
+ Fallback to roleValue(), rather than m_role, as it may be overriden.
+
2009-12-17 Jon Honeycutt <jhoneycutt at apple.com>
MSAA: Accessibility role of list items is wrong
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index 15a46d9..4000325 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -491,7 +491,7 @@ public:
virtual String stringRoleForMSAA() const { return String(); }
virtual String nameForMSAA() const { return String(); }
virtual String descriptionForMSAA() const { return String(); }
- virtual AccessibilityRole roleValueForMSAA() const { return m_role; }
+ virtual AccessibilityRole roleValueForMSAA() const { return roleValue(); }
// Used by an ARIA tree to get all its rows.
void ariaTreeRows(AccessibilityChildrenVector&);
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index bc9606c..05b970d 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -3136,7 +3136,7 @@ AccessibilityRole AccessibilityRenderObject::roleValueForMSAA() const
m_roleForMSAA = msaaRoleForRenderer(m_renderer);
if (m_roleForMSAA == UnknownRole)
- m_roleForMSAA = m_role;
+ m_roleForMSAA = roleValue();
return m_roleForMSAA;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list