Changeset 157434 in webkit

Timestamp:

Oct 14, 2013 5:23:25 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

AX: fieldset should have GroupRole and legend should be description.
​https://bugs.webkit.org/show_bug.cgi?id=122534

Patch by Samuel White <Samuel White> on 2013-10-14
Reviewed by Chris Fleizach.

Source/WebCore:

Changes fieldset to derive AXDescription from legend if one is available. Added
convenience method to AccessibilityObject to fetch element if available.

Test: accessibility/fieldset-element.html

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::canHaveChildren):
(WebCore::AccessibilityNodeObject::alternativeText):

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::element):
(WebCore::AccessibilityObject::isARIAHidden):
(WebCore::AccessibilityObject::isDOMHidden):
(WebCore::AccessibilityObject::defaultObjectInclusion):

• accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::isHidden):

• accessibility/AccessibilitySlider.cpp:

(WebCore::AccessibilitySlider::getAttribute):
(WebCore::AccessibilitySlider::valueForRange):
(WebCore::AccessibilitySlider::maxValueForRange):
(WebCore::AccessibilitySlider::minValueForRange):
(WebCore::AccessibilitySlider::setValue):
(WebCore::AccessibilitySlider::inputElement):

• accessibility/AccessibilitySlider.h:
• accessibility/mac/AccessibilityObjectMac.mm:

(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):

• html/HTMLFieldSetElement.cpp:

(WebCore::HTMLFieldSetElement::legend):

• html/HTMLFieldSetElement.h:

LayoutTests:

legend no longer treated as titleUIElement so removing tests that check this functionality.
Added test to check that legend is used as AXDescription of fieldset if present.

• accessibility/fieldset-element.html: Added.
• accessibility/hidden-legend-expected.txt: Removed.
• accessibility/hidden-legend.html: Removed.
• accessibility/legend.html: Removed.
• platform/efl/accessibility/legend-expected.txt: Removed.
• platform/gtk/accessibility/legend-expected.txt: Removed.
• platform/mac/accessibility/fieldset-element-expected.txt: Added.
• platform/mac/accessibility/legend-expected.txt: Removed.
• platform/mac/accessibility/role-subrole-roledescription-expected.txt:
• platform/mac/accessibility/role-subrole-roledescription.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/fieldset-element.html (added)
• LayoutTests/accessibility/hidden-legend-expected.txt (deleted)
• LayoutTests/accessibility/hidden-legend.html (deleted)
• LayoutTests/accessibility/legend.html (deleted)
• LayoutTests/platform/efl/accessibility/legend-expected.txt (deleted)
• LayoutTests/platform/gtk/accessibility/legend-expected.txt (deleted)
• LayoutTests/platform/mac/accessibility/fieldset-element-expected.txt (added)
• LayoutTests/platform/mac/accessibility/legend-expected.txt (deleted)
• LayoutTests/platform/mac/accessibility/role-subrole-roledescription-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/role-subrole-roledescription.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilitySlider.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilitySlider.h (modified) (1 diff)
• Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm (modified) (2 diffs)
• Source/WebCore/html/HTMLFieldSetElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLFieldSetElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-14  Samuel White  <samuel_white@apple.com>
+
+        AX: fieldset should have GroupRole and legend should be description.
+        https://bugs.webkit.org/show_bug.cgi?id=122534
+
+        Reviewed by Chris Fleizach.
+
+        legend no longer treated as titleUIElement so removing tests that check this functionality.
+        Added test to check that legend is used as AXDescription of fieldset if present.
+
+        * accessibility/fieldset-element.html: Added.
+        * accessibility/hidden-legend-expected.txt: Removed.
+        * accessibility/hidden-legend.html: Removed.
+        * accessibility/legend.html: Removed.
+        * platform/efl/accessibility/legend-expected.txt: Removed.
+        * platform/gtk/accessibility/legend-expected.txt: Removed.
+        * platform/mac/accessibility/fieldset-element-expected.txt: Added.
+        * platform/mac/accessibility/legend-expected.txt: Removed.
+        * platform/mac/accessibility/role-subrole-roledescription-expected.txt:
+        * platform/mac/accessibility/role-subrole-roledescription.html:
+
 2013-10-14  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/mac/accessibility/role-subrole-roledescription-expected.txt

@@ -116 +116 @@
       
 PASS: legend
-      AXRole: AXGroup
-      AXSubrole: 
-      AXRoleDescription: group
+      AXRole: 
+      AXSubrole: 
+      AXRoleDescription: 
       
 PASS: footer

trunk/LayoutTests/platform/mac/accessibility/role-subrole-roledescription.html

@@ -36 +36 @@
 <!-- skipped <embed> -->
 <fieldset data-role="AXGroup" data-subrole="" data-roledescription="group" class="ex">
-    <legend data-role="AXGroup" data-subrole="" data-roledescription="group" class="ex">X</legend>
+    <legend data-role="" data-subrole="" data-roledescription="" class="ex">X</legend>
 </fieldset>
 <!-- skipped figure/figcaption http://webkit.org/b/108996 -->

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-14  Samuel White  <samuel_white@apple.com>
+
+        AX: fieldset should have GroupRole and legend should be description.
+        https://bugs.webkit.org/show_bug.cgi?id=122534
+
+        Reviewed by Chris Fleizach.
+
+        Changes fieldset to derive AXDescription from legend if one is available. Added
+        convenience method to AccessibilityObject to fetch element if available.
+
+        Test: accessibility/fieldset-element.html
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::canHaveChildren):
+        (WebCore::AccessibilityNodeObject::alternativeText):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::element):
+        (WebCore::AccessibilityObject::isARIAHidden):
+        (WebCore::AccessibilityObject::isDOMHidden):
+        (WebCore::AccessibilityObject::defaultObjectInclusion):
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::isHidden):
+        * accessibility/AccessibilitySlider.cpp:
+        (WebCore::AccessibilitySlider::getAttribute):
+        (WebCore::AccessibilitySlider::valueForRange):
+        (WebCore::AccessibilitySlider::maxValueForRange):
+        (WebCore::AccessibilitySlider::minValueForRange):
+        (WebCore::AccessibilitySlider::setValue):
+        (WebCore::AccessibilitySlider::inputElement):
+        * accessibility/AccessibilitySlider.h:
+        * accessibility/mac/AccessibilityObjectMac.mm:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+        * html/HTMLFieldSetElement.cpp:
+        (WebCore::HTMLFieldSetElement::legend):
+        * html/HTMLFieldSetElement.h:
+
 2013-10-14  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -89 +89 @@
 using namespace HTMLNames;
 
+static String accessibleNameForNode(Node*);
+
 AccessibilityNodeObject::AccessibilityNodeObject(Node* node)
     : AccessibilityObject()
@@ -395 +397 @@
     case ProgressIndicatorRole:
         return false;
+    case LegendRole:
+        if (Element* element = this->element())
+            return !ancestorsOfType<HTMLFieldSetElement>(element).first();
     default:
         return true;
@@ -1251 +1256 @@
     if (!node)
         return;
+    
+    // The fieldset element derives its alternative text from the first associated legend element if one is available.
+    if (isHTMLFieldSetElement(node)) {
+        AccessibilityObject* object = axObjectCache()->getOrCreate(toHTMLFieldSetElement(node)->legend());
+        if (object && !object->isHidden())
+            textOrder.append(AccessibilityText(accessibleNameForNode(object->node()), AlternativeText));
+    }
     
 #if ENABLE(SVG)

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1537 +1537 @@
 }
 
+Element* AccessibilityObject::element() const
+{
+    Node* node = this->node();
+    if (node && node->isElementNode())
+        return toElement(node);
+    return 0;
+}
+
 const AtomicString& AccessibilityObject::placeholderValue() const
 {
@@ -1996 +2004 @@
 }
 
-bool AccessibilityObject::ariaIsHidden() const
-{
-    if (equalIgnoringCase(getAttribute(aria_hiddenAttr), "true"))
-        return true;
-    
-    for (AccessibilityObject* object = parentObject(); object; object = object->parentObject()) {
+// ARIA component of hidden definition.
+// http://www.w3.org/TR/wai-aria/terms#def_hidden
+bool AccessibilityObject::isARIAHidden() const
+{
+    for (const AccessibilityObject* object = this; object; object = object->parentObject()) {
         if (equalIgnoringCase(object->getAttribute(aria_hiddenAttr), "true"))
             return true;
     }
-    
     return false;
 }
 
+// DOM component of hidden definition.
+// http://www.w3.org/TR/wai-aria/terms#def_hidden
+bool AccessibilityObject::isDOMHidden() const
+{
+    RenderObject* renderer = this->renderer();
+    if (!renderer)
+        return true;
+    
+    RenderStyle* style = renderer->style();
+    return style->display() == NONE || style->visibility() != VISIBLE;
+}
+
 AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
 {
-    if (ariaIsHidden())
+    if (isARIAHidden())
         return IgnoreObject;
     

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -516 +516 @@
     virtual bool canSetExpandedAttribute() const { return false; }
     
+    Element* element() const;
     virtual Node* node() const { return 0; }
     virtual RenderObject* renderer() const { return 0; }
@@ -845 +846 @@
     virtual void mathPrescripts(AccessibilityMathMultiscriptPairs&) { }
     virtual void mathPostscripts(AccessibilityMathMultiscriptPairs&) { }
-
+    
+    // Visibility.
+    bool isARIAHidden() const;
+    bool isDOMHidden() const;
+    bool isHidden() const { return isARIAHidden() || isDOMHidden(); }
+    
 #if HAVE(ACCESSIBILITY)
 #if PLATFORM(GTK) || PLATFORM(EFL)
@@ -901 +907 @@
     static bool objectMatchesSearchCriteriaWithResultLimit(AccessibilityObject*, AccessibilitySearchCriteria*, AccessibilityChildrenVector&);
     virtual AccessibilityRole buttonRoleType() const;
-    bool ariaIsHidden() const;
     bool isOnscreen() const;
     

trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp

@@ -100 +100 @@
 const AtomicString& AccessibilitySlider::getAttribute(const QualifiedName& attribute) const
 {
-    return element()->getAttribute(attribute);
+    return inputElement()->getAttribute(attribute);
 }
     
@@ -116 +116 @@
 float AccessibilitySlider::valueForRange() const
 {
-    return element()->value().toFloat();
+    return inputElement()->value().toFloat();
 }
 
 float AccessibilitySlider::maxValueForRange() const
 {
-    return static_cast<float>(element()->maximum());
+    return static_cast<float>(inputElement()->maximum());
 }
 
 float AccessibilitySlider::minValueForRange() const
 {
-    return static_cast<float>(element()->minimum());
+    return static_cast<float>(inputElement()->minimum());
 }
 
 void AccessibilitySlider::setValue(const String& value)
 {
-    HTMLInputElement* input = element();
+    HTMLInputElement* input = inputElement();
     
     if (input->value() == value)
@@ -142 +142 @@
 }
 
-HTMLInputElement* AccessibilitySlider::element() const
+HTMLInputElement* AccessibilitySlider::inputElement() const
 {
     return toHTMLInputElement(m_renderer->node());

trunk/Source/WebCore/accessibility/AccessibilitySlider.h

@@ -47 +47 @@
 
 private:
-    HTMLInputElement* element() const;
+    HTMLInputElement* inputElement() const;
     virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const OVERRIDE;
 

trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm

@@ -26 +26 @@
 #import "config.h"
 #import "AccessibilityObject.h"
+#import "ElementAncestorIterator.h"
+#import "HTMLFieldSetElement.h"
+#import "RenderObject.h"
 
 #if HAVE(ACCESSIBILITY)
@@ -80 +83 @@
         return IgnoreObject;
     
+    if (RenderObject* renderer = this->renderer()) {
+        // The legend element is ignored if it lives inside of a fieldset element that uses it to generate alternative text.
+        if (renderer->isLegend()) {
+            Element* element = this->element();
+            if (element && ancestorsOfType<HTMLFieldSetElement>(element).first())
+                return IgnoreObject;
+        }
+    }
+    
     return DefaultBehavior;
 }

trunk/Source/WebCore/html/HTMLFieldSetElement.cpp

@@ -89 +89 @@
 }
 
-const HTMLLegendElement* HTMLFieldSetElement::legend() const
+HTMLLegendElement* HTMLFieldSetElement::legend() const
 {
-    return descendantsOfType<HTMLLegendElement>(this).first();
+    return const_cast<HTMLLegendElement*>(descendantsOfType<HTMLLegendElement>(this).first());
 }
 

trunk/Source/WebCore/html/HTMLFieldSetElement.h

@@ -36 +36 @@
     static PassRefPtr<HTMLFieldSetElement> create(const QualifiedName&, Document&, HTMLFormElement*);
 
-    const HTMLLegendElement* legend() const;
+    HTMLLegendElement* legend() const;
     PassRefPtr<HTMLCollection> elements();