Changeset 52351 in webkit

Timestamp:

Dec 18, 2009 4:05:38 PM (14 years ago)

Author:

jhoneycutt@apple.com

Message:

MSAA: Accessibility role of list items is wrong

​https://bugs.webkit.org/show_bug.cgi?id=32688

Reviewed by Adam Roben.

WebCore:

Test: platform/win/accessibility/list-item-role.html

• accessibility/AccessibilityObject.h:

(WebCore::):
Add a ListItemRole to the enum.

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::msaaRoleForRenderer):
Return the role for the RenderObject, or UnknownRole if unknown.
(WebCore::AccessibilityRenderObject::roleValueForMSAA):
Call msaaRoleForRenderer() to get the role. If it is UnknownRole, fall
back to m_role.

WebKit/win:

• AccessibleBase.cpp:

(MSAARole):
Make the WebCore list item role map to the MSAA list item role.

LayoutTests:

• platform/win/accessibility/list-item-role-expected.txt: Added.
• platform/win/accessibility/list-item-role.html: Added.

Verify that the list item role is "list item".

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/accessibility/list-item-role-expected.txt (added)
• LayoutTests/platform/win/accessibility/list-item-role.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)
• WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)
• WebKit/win/AccessibleBase.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-17  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        MSAA: Accessibility role of list items is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=32688
+
+        Reviewed by Adam Roben.
+
+        * platform/win/accessibility/list-item-role-expected.txt: Added.
+        * platform/win/accessibility/list-item-role.html: Added.
+        Verify that the list item role is "list item".
+
 2009-12-17  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-17  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        MSAA: Accessibility role of list items is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=32688
+
+        Reviewed by Adam Roben.
+
+        Test: platform/win/accessibility/list-item-role.html
+
+        * accessibility/AccessibilityObject.h:
+        (WebCore::):
+        Add a ListItemRole to the enum.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::msaaRoleForRenderer):
+        Return the role for the RenderObject, or UnknownRole if unknown.
+        (WebCore::AccessibilityRenderObject::roleValueForMSAA):
+        Call msaaRoleForRenderer() to get the role. If it is UnknownRole, fall
+        back to m_role.
+
 2009-12-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/accessibility/AccessibilityObject.h

@@ -170 +170 @@
     DirectoryRole,
     EditableTextRole,
-    
+    ListItemRole,
+
     // ARIA Grouping roles
     LandmarkApplicationRole,

trunk/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -3115 +3115 @@
 }
 
+static AccessibilityRole msaaRoleForRenderer(const RenderObject* renderer)
+{
+    if (!renderer)
+        return UnknownRole;
+
+    if (renderer->isText())
+        return EditableTextRole;
+
+    if (renderer->isListItem())
+        return ListItemRole;
+
+    return UnknownRole;
+}
+
 AccessibilityRole AccessibilityRenderObject::roleValueForMSAA() const
 {
@@ -3120 +3134 @@
         return m_roleForMSAA;
 
-    if (m_renderer && m_renderer->isText())
-        m_roleForMSAA = EditableTextRole;
-    else
+    m_roleForMSAA = msaaRoleForRenderer(m_renderer);
+
+    if (m_roleForMSAA == UnknownRole)
         m_roleForMSAA = m_role;
 

trunk/WebKit/win/AccessibleBase.cpp

@@ -566 +566 @@
         case WebCore::ImageRole:
             return ROLE_SYSTEM_GRAPHIC;
+        case WebCore::ListItemRole:
+            return ROLE_SYSTEM_LISTITEM;
         default:
             // This is the default role for MSAA.

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-12-17  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        MSAA: Accessibility role of list items is wrong
+
+        https://bugs.webkit.org/show_bug.cgi?id=32688
+
+        Reviewed by Adam Roben.
+
+        * AccessibleBase.cpp:
+        (MSAARole):
+        Make the WebCore list item role map to the MSAA list item role.
+
 2009-12-17  Jon Honeycutt  <jhoneycutt@apple.com>