Changeset 68023 in webkit

Timestamp:

Sep 22, 2010 12:49:34 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-22 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Chris Fleizach.

[Gtk] Incorrect exposure of list items whose children are elements
​https://bugs.webkit.org/show_bug.cgi?id=45383

Check that list items will be always exposed like that for GTK

• platform/gtk/accessibility/list-items-always-exposed-expected.txt: Added.
• platform/gtk/accessibility/list-items-always-exposed.html: Added.

2010-09-22 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Chris Fleizach.

[Gtk] Incorrect exposure of list items whose children are elements
​https://bugs.webkit.org/show_bug.cgi?id=45383

Set ATK_ROLE_LIST_ITEM looking for the role of the parent object

Test: platform/gtk/accessibility/list-items-always-exposed.html

• accessibility/gtk/AccessibilityObjectAtk.cpp: (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject): Always include objects with ListItemRole in accessibility for GTK.
• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (getInterfaceMaskFromObject): Add some specific code to handle the special case of list markers by implementing AtkText when needed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/list-items-always-exposed-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/list-items-always-exposed.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-22  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        [Gtk] Incorrect exposure of list items whose children are elements
+        https://bugs.webkit.org/show_bug.cgi?id=45383
+
+        Check that list items will be always exposed like that for GTK
+
+        * platform/gtk/accessibility/list-items-always-exposed-expected.txt: Added.
+        * platform/gtk/accessibility/list-items-always-exposed.html: Added.
+
 2010-09-22  Michael Saboff  <msaboff@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-22  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        [Gtk] Incorrect exposure of list items whose children are elements
+        https://bugs.webkit.org/show_bug.cgi?id=45383
+
+        Set ATK_ROLE_LIST_ITEM looking for the role of the parent object
+
+        Test: platform/gtk/accessibility/list-items-always-exposed.html
+
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+        Always include objects with ListItemRole in accessibility for GTK.
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (getInterfaceMaskFromObject): Add some specific code to handle the
+        special case of list markers by implementing AtkText when needed.
+
 2010-09-22  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp

@@ -74 +74 @@
         return IgnoreObject;
 
+    // Include all list items, regardless they have or not inline children
+    if (role == ListItemRole)
+        return IncludeObject;
+
     // Bullets/numbers for list items shouldn't be exposed as AtkObjects.
-    if (roleValue() == ListMarkerRole)
+    if (role == ListMarkerRole)
         return IgnoreObject;
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -2027 +2027 @@
             if (!coreObject->isReadOnly())
                 interfaceMask |= 1 << WAI_EDITABLE_TEXT;
-        } else if (role != TableRole && static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->childrenInline())
-            interfaceMask |= 1 << WAI_TEXT;
+        } else {
+            AccessibilityRenderObject* axRenderObject = static_cast<AccessibilityRenderObject*>(coreObject);
+            RenderObject* renderer = axRenderObject->renderer();
+            if (role != TableRole && renderer && renderer->childrenInline())
+                interfaceMask |= 1 << WAI_TEXT;
+            else if (role == ListItemRole) {
+                // Add the TEXT interface for list items whose
+                // first accessible child has a text renderer
+                AccessibilityObject::AccessibilityChildrenVector children = axRenderObject->children();
+                if (children.size()) {
+                    AccessibilityObject* axRenderChild = children.at(0).get();
+                    interfaceMask |= getInterfaceMaskFromObject(axRenderChild);
+                }
+            }
+        }
 
     // Image