Adding support for ARIA 1.1 role="none"

Source/core/accessibility/AXRenderObject.cpp

 /*
 * Copyright (C) 2008 Apple 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 580 matching lines @@
     if (decision == IgnoreObject)
         return true;
 
     // If this element is within a parent that cannot have children, it should not be exposed.
     if (isDescendantOfBarrenParent())
         return true;
 
     if (roleValue() == IgnoredRole)
         return true;
 
-    if (roleValue() == PresentationalRole || inheritsPresentationalRole())
+    if ((roleValue() == NoneRole || roleValue() == PresentationalRole) || inheritsNoneOrPresentationalRole())
         return true;
 
     // An ARIA tree can only have tree items and static text as children.
     if (!isAllowedChildOfTree())
         return true;
 
     // TODO: we should refactor this - but right now this is necessary to make
     // sure scroll areas stay in the tree.
     if (isAttachment())
         return false;
@@ skipping 377 matching lines @@
 void AXRenderObject::ariaOwnsElements(AccessibilityChildrenVector& owns) const
 {
     accessibilityChildrenFromAttribute(aria_ownsAttr, owns);
 }
 
 bool AXRenderObject::ariaHasPopup() const
 {
     return elementAttributeValue(aria_haspopupAttr);
 }
 
-bool AXRenderObject::ariaRoleHasPresentationalChildren() const
+bool AXRenderObject::ariaRoleHasNoneOrPresentationalChildren() const

[shreeramk, 2014/09/20 12:39:36]

Same query as AXObject.h

 {
     switch (m_ariaRole) {
     case ButtonRole:
     case SliderRole:
     case ImageRole:
     case ProgressIndicatorRole:
     case SpinButtonRole:
     // case SeparatorRole:
         return true;
     default:
         return false;
     }
 }
 
-bool AXRenderObject::isPresentationalChildOfAriaRole() const
+bool AXRenderObject::isNoneOrPresentationalChildOfAriaRole() const
 {
     // Walk the parent chain looking for a parent that has presentational children
     AXObject* parent;
-    for (parent = parentObject(); parent && !parent->ariaRoleHasPresentationalChildren(); parent = parent->parentObject())
+    for (parent = parentObject(); parent && !parent->ariaRoleHasNoneOrPresentationalChildren(); parent = parent->parentObject())
     { }
 
     return parent;
 }
 
 bool AXRenderObject::shouldFocusActiveDescendant() const
 {
     switch (ariaRoleAttribute()) {
     case ComboBoxRole:
     case GridRole:
@@ skipping 1238 matching lines @@
 }
 
 bool AXRenderObject::elementAttributeValue(const QualifiedName& attributeName) const
 {
     if (!m_renderer)
         return false;
 
     return equalIgnoringCase(getAttribute(attributeName), "true");
 }
 
-bool AXRenderObject::inheritsPresentationalRole() const
+bool AXRenderObject::inheritsNoneOrPresentationalRole() const

[shreeramk, 2014/09/20 12:39:36]

Same query as AXRenderObject.h

 {
-    // ARIA states if an item can get focus, it should not be presentational.
+    // ARIA states if an item can get focus, it should not be none or presentational.
     if (canSetFocusAttribute())
         return false;
 
-    // ARIA spec says that when a parent object is presentational, and it has required child elements,
-    // those child elements are also presentational. For example, <li> becomes presentational from <ul>.
+    // ARIA spec says that when a parent object is none or presentational, and it has required child elements,
+    // those child elements are also none or presentational. For example, <li> becomes presentational from <ul>.
     // http://www.w3.org/WAI/PF/aria/complete#presentation
     if (roleValue() != ListItemRole && roleValue() != ListMarkerRole)
         return false;
 
     AXObject* parent = parentObject();
     if (!parent->isAXRenderObject())
         return false;
 
     Node* elementNode = toAXRenderObject(parent)->node();
     if (!elementNode || !elementNode->isElementNode())
         return false;
 
     QualifiedName tagName = toElement(elementNode)->tagQName();
     if (tagName == ulTag || tagName == olTag || tagName == dlTag)
-        return parent->roleValue() == PresentationalRole;
+        return (parent->roleValue() == NoneRole || parent->roleValue() == PresentationalRole);
 
     return false;
 }
 
 LayoutRect AXRenderObject::computeElementRect() const
 {
     RenderObject* obj = m_renderer;
 
     if (!obj)
         return LayoutRect();
@@ skipping 34 matching lines @@
         if (label && label->renderer()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink