Changeset 184676 in webkit

Timestamp:

May 20, 2015 4:42:08 PM (9 years ago)

Author:

Chris Fleizach

Message:

AX: improve list heuristics (presentational use versus actual lists)
​https://bugs.webkit.org/show_bug.cgi?id=134187

Reviewed by Darin Adler.

Source/WebCore:

Improve heuristics for list detection by:

1. Not exposing lists without list markers (unless explicitly marked as lists)
2. Recognizing css: before-content as list markers

Test: accessibility/list-detection2.html

• accessibility/AccessibilityList.cpp:

(WebCore::AccessibilityList::isDescriptionList):
(WebCore::AccessibilityList::childHasPseudoVisibleListItemMarkers):
(WebCore::AccessibilityList::determineAccessibilityRole):

• accessibility/AccessibilityList.h:

LayoutTests:

• accessibility/list-detection-expected.txt:
• accessibility/list-detection.html:
• accessibility/list-detection2-expected.txt: Added.
• accessibility/list-detection2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/list-detection-expected.txt (modified) (1 diff)
• LayoutTests/accessibility/list-detection.html (modified) (1 diff)
• LayoutTests/accessibility/list-detection2-expected.txt (added)
• LayoutTests/accessibility/list-detection2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityList.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityList.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-20  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: improve list heuristics (presentational use versus actual lists)
+        https://bugs.webkit.org/show_bug.cgi?id=134187
+
+        Reviewed by Darin Adler.
+
+        * accessibility/list-detection-expected.txt:
+        * accessibility/list-detection.html:
+        * accessibility/list-detection2-expected.txt: Added.
+        * accessibility/list-detection2.html: Added.
+
 2015-05-20  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/accessibility/list-detection-expected.txt

@@ -36 +36 @@
 
 
-Unordered list with more than 1 item and no style is a list.
-PASS axElement.role == 'AXRole: AXList' is true
+Unordered list with more than 1 item and no style is not a list.
+PASS axElement.role == 'AXRole: AXList' is false
 
 

trunk/LayoutTests/accessibility/list-detection.html

@@ -41 +41 @@
 </ul>
 
-<ul id="list9" style="list-style-type: none;" test-description="Unordered list with more than 1 item and no style is a list." is-list="true">
+<ul id="list9" style="list-style-type: none;" test-description="Unordered list with more than 1 item and no style is not a list." is-list="false">
 <li>item</li>
 <li>item</li>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-20  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: improve list heuristics (presentational use versus actual lists)
+        https://bugs.webkit.org/show_bug.cgi?id=134187
+
+        Reviewed by Darin Adler.
+
+        Improve heuristics for list detection by:
+            1. Not exposing lists without list markers (unless explicitly marked as lists)
+            2. Recognizing css: before-content as list markers
+
+        Test: accessibility/list-detection2.html
+
+        * accessibility/AccessibilityList.cpp:
+        (WebCore::AccessibilityList::isDescriptionList):
+        (WebCore::AccessibilityList::childHasPseudoVisibleListItemMarkers):
+        (WebCore::AccessibilityList::determineAccessibilityRole):
+        * accessibility/AccessibilityList.h:
+
 2015-05-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityList.cpp

@@ -33 +33 @@
 #include "HTMLElement.h"
 #include "HTMLNames.h"
+#include "PseudoElement.h"
 #include "RenderListItem.h"
 #include "RenderObject.h"
@@ -98 +99 @@
 }
 
+bool AccessibilityList::childHasPseudoVisibleListItemMarkers(RenderObject* listItem)
+{
+    // Check if the list item has a pseudo-element that should be accessible (e.g. an image or text)
+    Element* listItemElement = downcast<Element>(listItem->node());
+    if (!listItemElement || !listItemElement->beforePseudoElement())
+        return false;
+
+    AccessibilityObject* axObj = axObjectCache()->getOrCreate(listItemElement->beforePseudoElement()->renderer());
+    if (!axObj)
+        return false;
+    
+    if (!axObj->accessibilityIsIgnored())
+        return true;
+    
+    for (const auto& child : axObj->children()) {
+        if (!child->accessibilityIsIgnored())
+            return true;
+    }
+    
+    return false;
+}
+    
 AccessibilityRole AccessibilityList::determineAccessibilityRole()
 {
@@ -132 +155 @@
         else if (child->roleValue() == ListItemRole) {
             RenderObject* listItem = child->renderer();
-            if (listItem && listItem->isListItem()) {
-                if (listItem->style().listStyleType() != NoneListStyle || listItem->style().listStyleImage())
+            if (!listItem)
+                continue;
+            
+            // Rendered list items always count.
+            if (listItem->isListItem()) {
+                if (!hasVisibleMarkers && (listItem->style().listStyleType() != NoneListStyle || listItem->style().listStyleImage() || childHasPseudoVisibleListItemMarkers(listItem)))
                     hasVisibleMarkers = true;
                 listItemCount++;
+            } else if (listItem->node() && listItem->node()->hasTagName(liTag)) {
+                // Inline elements that are in a list with an explicit role should also count.
+                if (m_ariaRole == ListRole)
+                    listItemCount++;
+
+                if (childHasPseudoVisibleListItemMarkers(listItem)) {
+                    hasVisibleMarkers = true;
+                    listItemCount++;
+                }
             }
         }
     }
     
-    bool unorderedList = isUnorderedList();
     // Non <ul> lists and ARIA lists only need to have one child.
-    // <ul> lists need to have 1 child, or visible markers.
-    if (!unorderedList || ariaRoleAttribute() != UnknownRole) {
+    // <ul>, <ol> lists need to have visible markers.
+    if (ariaRoleAttribute() != UnknownRole) {
         if (!listItemCount)
             role = GroupRole;
-    } else if (unorderedList && listItemCount <= 1 && !hasVisibleMarkers)
+    } else if (!hasVisibleMarkers)
         role = GroupRole;
 

trunk/Source/WebCore/accessibility/AccessibilityList.h

@@ -50 +50 @@
     virtual bool computeAccessibilityIsIgnored() const override;
     virtual AccessibilityRole determineAccessibilityRole() override;
+    bool childHasPseudoVisibleListItemMarkers(RenderObject*);
 };