Adding a11y support for HTML5 <datalist>

Source/modules/accessibility/AXNodeObject.cpp

 /*
 * Copyright (C) 2012, Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 159 matching lines @@
         return true;
 
     // Ignore labels that are already referenced by a control's title UI element.
     AXObject* controlObject = correspondingControlForLabelElement();
     if (controlObject && !controlObject->exposesTitleUIElement() && controlObject->isCheckboxOrRadio())
         return true;
 
     return m_role == UnknownRole;
 }
 
-AccessibilityRole AXNodeObject::determineAccessibilityRole()
+AccessibilityRole AXNodeObject::determineAccessibilityRoleUtil()
 {
     if (!node())
         return UnknownRole;
-
-    if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
-        return m_ariaRole;
-
     if (node()->isLink())
         return LinkRole;
-    if (node()->isTextNode())
-        return StaticTextRole;
     if (isHTMLButtonElement(*node()))
         return buttonRoleType();
     if (isHTMLDetailsElement(*node()))
         return DetailsRole;
     if (isHTMLSummaryElement(*node())) {
         if (node()->parentNode() && isHTMLDetailsElement(node()->parentNode()))
             return DisclosureTriangleRole;
         return UnknownRole;
     }
 
     if (isHTMLInputElement(*node())) {
         HTMLInputElement& input = toHTMLInputElement(*node());
         const AtomicString& type = input.type();
+        if (input.dataList())
+            return ComboBoxRole;
         if (type == InputTypeNames::button) {
             if ((node()->parentNode() && isHTMLMenuElement(node()->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole))
                 return MenuItemRole;
             return buttonRoleType();
         }
         if (type == InputTypeNames::checkbox) {
             if ((node()->parentNode() && isHTMLMenuElement(node()->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole))
                 return MenuItemCheckBoxRole;
             return CheckBoxRole;
         }
         if (type == InputTypeNames::date)
             return DateRole;
         if (type == InputTypeNames::datetime
             || type == InputTypeNames::datetime_local
             || type == InputTypeNames::month
             || type == InputTypeNames::week)
             return DateTimeRole;
+        if (type == InputTypeNames::file)
+            return ButtonRole;
         if (type == InputTypeNames::radio) {
             if ((node()->parentNode() && isHTMLMenuElement(node()->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole))
                 return MenuItemRadioRole;
             return RadioButtonRole;
         }
         if (type == InputTypeNames::number)
             return SpinButtonRole;
         if (input.isTextButton())
             return buttonRoleType();
         if (type == InputTypeNames::range)
@@ skipping 25 matching lines @@
     if (isHTMLRubyElement(*node()))
         return RubyRole;
     if (isHTMLDListElement(*node()))
         return DescriptionListRole;
     if (node()->isElementNode() && node()->hasTagName(blockquoteTag))
         return BlockquoteRole;
     if (node()->isElementNode() && node()->hasTagName(figcaptionTag))
         return FigcaptionRole;
     if (node()->isElementNode() && node()->hasTagName(figureTag))
         return FigureRole;
-    if (node()->isElementNode() && toElement(node())->isFocusable())
-        return GroupRole;
     if (isHTMLAnchorElement(*node()) && isClickable())
         return LinkRole;
     if (isHTMLIFrameElement(*node()))
         return IframeRole;
     if (isEmbeddedObject())
         return EmbeddedObjectRole;
-
     return UnknownRole;
 }
 
+AccessibilityRole AXNodeObject::determineAccessibilityRole()
+{
+    if (!node())
+        return UnknownRole;
+
+    if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
+        return m_ariaRole;
+    if (node()->isTextNode())
+        return StaticTextRole;
+
+    AccessibilityRole role = determineAccessibilityRoleUtil();
+    if (role != UnknownRole)
+        return role;
+    if (node()->isElementNode() && toElement(node())->isFocusable())
+        return GroupRole;
+    return UnknownRole;
+}
+
 AccessibilityRole AXNodeObject::determineAriaRoleAttribute() const
 {
     const AtomicString& ariaRole = getAttribute(roleAttr);
     if (ariaRole.isNull() || ariaRole.isEmpty())
         return UnknownRole;
 
     AccessibilityRole role = ariaRoleToWebCoreRole(ariaRole);
 
     // ARIA states if an item can get focus, it should not be presentational.
     if ((role == NoneRole || role == PresentationalRole) && canSetFocusAttribute())
@@ skipping 1328 matching lines @@
 
 HTMLLabelElement* AXNodeObject::labelElementContainer() const
 {
     if (!node())
         return 0;
 
     // the control element should not be considered part of the label
     if (isControl())
         return 0;
 
+    // the link element should not be considered part of the label
+    if (isLink())
+        return 0;
+
     // find if this has a ancestor that is a label
     return Traversal<HTMLLabelElement>::firstAncestorOrSelf(*node());
 }
 
 void AXNodeObject::setFocused(bool on)
 {
     if (!canSetFocusAttribute())
         return;
 
     Document* document = this->document();
@@ skipping 183 matching lines @@
     float range = maxValueForRange() - minValueForRange();
     float value = valueForRange();
 
     value += range * (percentChange / 100);
     setValue(String::number(value));
 
     axObjectCache()->postNotification(node(), AXObjectCacheImpl::AXValueChanged, true);
 }
 
 } // namespace blink