Changeset 155601 in webkit

Timestamp:

Sep 12, 2013 2:51:25 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

AX: Self-referencing aria-labelledby only uses contents.
​https://bugs.webkit.org/show_bug.cgi?id=120814

Patch by Samuel White <Samuel White> on 2013-09-12
Reviewed by Mario Sanchez Prada.

Source/WebCore:

Implemented additional 'Text Alternative Computation' steps documented at:
​http://www.w3.org/WAI/PF/aria/complete#textalternativecomputation. This allows us to remove
our raw text node iteration that was previously forcing us to do our computation incorrectly.
Element content is now sourced using textUnderElement (step 2C of the computation).

Test: accessibility/self-referencing-aria-labelledby.html

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::accessibleNameForNode):
(WebCore::AccessibilityNodeObject::accessibilityDescriptionForElements):

LayoutTests:

Test to verify that self-referencing aria-labelledby behavior works as expected.

• accessibility/self-referencing-aria-labelledby-expected.txt: Added.
• accessibility/self-referencing-aria-labelledby.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/self-referencing-aria-labelledby-expected.txt (added)
• LayoutTests/accessibility/self-referencing-aria-labelledby.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-12  Samuel White  <samuel_white@apple.com>
+
+        AX: Self-referencing aria-labelledby only uses contents.
+        https://bugs.webkit.org/show_bug.cgi?id=120814
+
+        Reviewed by Mario Sanchez Prada.
+
+        Test to verify that self-referencing aria-labelledby behavior works as expected.
+
+        * accessibility/self-referencing-aria-labelledby-expected.txt: Added.
+        * accessibility/self-referencing-aria-labelledby.html: Added.
+
 2013-09-12  Denis Nomiyama  <d.nomiyama@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-12  Samuel White  <samuel_white@apple.com>
+
+        AX: Self-referencing aria-labelledby only uses contents.
+        https://bugs.webkit.org/show_bug.cgi?id=120814
+
+        Reviewed by Mario Sanchez Prada.
+
+        Implemented additional 'Text Alternative Computation' steps documented at:
+        http://www.w3.org/WAI/PF/aria/complete#textalternativecomputation. This allows us to remove
+        our raw text node iteration that was previously forcing us to do our computation incorrectly.
+        Element content is now sourced using textUnderElement (step 2C of the computation).
+
+        Test: accessibility/self-referencing-aria-labelledby.html
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::accessibleNameForNode):
+        (WebCore::AccessibilityNodeObject::accessibilityDescriptionForElements):
+
 2013-09-12  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -1753 +1753 @@
 static String accessibleNameForNode(Node* node)
 {
-    if (node->isTextNode())
-        return toText(node)->data();
-
+    if (!node->isHTMLElement())
+        return String();
+    
+    HTMLElement* element = toHTMLElement(node);
+    
+    const AtomicString& ariaLabel = element->fastGetAttribute(aria_labelAttr);
+    if (!ariaLabel.isEmpty())
+        return ariaLabel;
+    
+    const AtomicString& alt = element->fastGetAttribute(altAttr);
+    if (!alt.isEmpty())
+        return alt;
+    
     if (isHTMLInputElement(node))
         return toHTMLInputElement(node)->value();
-
-    if (node->isHTMLElement()) {
-        const AtomicString& alt = toHTMLElement(node)->getAttribute(altAttr);
-        if (!alt.isEmpty())
-            return alt;
-    }
-
+    
+    String text = node->document().axObjectCache()->getOrCreate(node)->textUnderElement();
+    if (!text.isEmpty())
+        return text;
+    
+    const AtomicString& title = element->fastGetAttribute(titleAttr);
+    if (!title.isEmpty())
+        return title;
+    
     return String();
 }
@@ -1773 +1785 @@
     unsigned size = elements.size();
     for (unsigned i = 0; i < size; ++i) {
-        Element* idElement = elements[i];
-
-        builder.append(accessibleNameForNode(idElement));
-        for (Node* n = idElement->firstChild(); n; n = NodeTraversal::next(n, idElement))
-            builder.append(accessibleNameForNode(n));
-
-        if (i != size - 1)
+        if (i)
             builder.append(' ');
+        
+        builder.append(accessibleNameForNode(elements[i]));
     }
     return builder.toString();