Finish all string attributes for Accessibility Object Model Phase 1.

third_party/WebKit/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 799 matching lines @@
   return 0;
 }
 
 static Element* siblingWithAriaRole(String role, Node* node) {
   Node* parent = node->parentNode();
   if (!parent)
     return 0;
 
   for (Element* sibling = ElementTraversal::firstChild(*parent); sibling;
        sibling = ElementTraversal::nextSibling(*sibling)) {
-    const AtomicString& siblingAriaRole = sibling->getAttribute(roleAttr);
+    const AtomicString& siblingAriaRole =
+        AccessibleNode::getProperty(sibling, AOMStringProperty::kRole);
     if (equalIgnoringCase(siblingAriaRole, role))
       return sibling;
   }
 
   return 0;
 }
 
 Element* AXNodeObject::menuItemElementForMenu() const {
   if (ariaRoleAttribute() != MenuRole)
     return 0;
@@ skipping 84 matching lines @@
     return;
 
   AXSparseAttributeSetterMap& axSparseAttributeSetterMap =
       getSparseAttributeSetterMap();
   AttributeCollection attributes = toElement(node)->attributesWithoutUpdate();
   for (const Attribute& attr : attributes) {
     SparseAttributeSetter* setter = axSparseAttributeSetterMap.at(attr.name());
     if (setter)
       setter->run(*this, sparseAttributeClient, attr.value());
   }
+
+  // TODO(dmazzoni): Efficiently iterate over AccessibleNode properties that are
+  // set and merge the two loops somehow.
+  if (toElement(node)->existingAccessibleNode()) {
+    AtomicString keyShortcuts =
+        getAOMPropertyOrARIAAttribute(AOMStringProperty::kKeyShortcuts);
+    if (!keyShortcuts.isNull()) {
+      axSparseAttributeSetterMap.at(aria_keyshortcutsAttr)
+          ->run(*this, sparseAttributeClient, keyShortcuts);
+    }
+    AtomicString roleDescription =
+        getAOMPropertyOrARIAAttribute(AOMStringProperty::kRoleDescription);
+    if (!roleDescription.isNull()) {
+      axSparseAttributeSetterMap.at(aria_roledescriptionAttr)
+          ->run(*this, sparseAttributeClient, roleDescription);
+    }
+  }
 }
 
 bool AXNodeObject::isAnchor() const {
   return !isNativeImage() && isLink();
 }
 
 bool AXNodeObject::isControl() const {
   Node* node = this->getNode();
   if (!node)
     return false;
@@ skipping 171 matching lines @@
     return toHTMLInputElement(*node).shouldAppearChecked();
 
   // Else, if this is an ARIA role checkbox or radio or menuitemcheckbox
   // or menuitemradio or switch, respect the aria-checked attribute
   switch (ariaRoleAttribute()) {
     case CheckBoxRole:
     case MenuItemCheckBoxRole:
     case MenuItemRadioRole:
     case RadioButtonRole:
     case SwitchRole:
-      if (equalIgnoringCase(getAttribute(aria_checkedAttr), "true"))
+      if (equalIgnoringCase(
+              getAOMPropertyOrARIAAttribute(AOMStringProperty::kChecked),
+              "true"))
         return true;
       return false;
     default:
       break;
   }
 
   // Otherwise it's not checked
   return false;
 }
 
@@ skipping 241 matching lines @@
   }
 
   return level;
 }
 
 String AXNodeObject::ariaAutoComplete() const {
   if (roleValue() != ComboBoxRole)
     return String();
 
   const AtomicString& ariaAutoComplete =
-      getAttribute(aria_autocompleteAttr).lower();
+      getAOMPropertyOrARIAAttribute(AOMStringProperty::kAutocomplete).lower();
 
   if (ariaAutoComplete == "inline" || ariaAutoComplete == "list" ||
       ariaAutoComplete == "both")
     return ariaAutoComplete;
 
   return String();
 }
 
 void AXNodeObject::markers(Vector<DocumentMarker::MarkerType>& markerTypes,
                            Vector<AXRange>& markerRanges) const {
@@ skipping 41 matching lines @@
   TreeScope& treeScope = anchor->treeScope();
   Element* target = treeScope.findAnchor(fragment);
   if (!target)
     return AXObject::inPageLinkTarget();
   // If the target is not in the accessibility tree, get the first unignored
   // sibling.
   return axObjectCache().firstAccessibleObjectFromNode(target);
 }
 
 AccessibilityOrientation AXNodeObject::orientation() const {
-  const AtomicString& ariaOrientation = getAttribute(aria_orientationAttr);
+  const AtomicString& ariaOrientation =
+      getAOMPropertyOrARIAAttribute(AOMStringProperty::kOrientation);
   AccessibilityOrientation orientation = AccessibilityOrientationUndefined;
   if (equalIgnoringCase(ariaOrientation, "horizontal"))
     orientation = AccessibilityOrientationHorizontal;
   else if (equalIgnoringCase(ariaOrientation, "vertical"))
     orientation = AccessibilityOrientationVertical;
 
   switch (roleValue()) {
     case ComboBoxRole:
     case ListBoxRole:
     case MenuRole:
@@ skipping 125 matching lines @@
     return AXObject::colorValue();
 
   // HTMLInputElement::value always returns a string parseable by Color.
   Color color;
   bool success = color.setFromString(input->value());
   DCHECK(success);
   return color.rgb();
 }
 
 AriaCurrentState AXNodeObject::ariaCurrentState() const {
-  if (!hasAttribute(aria_currentAttr))
-    return AXObject::ariaCurrentState();
-
-  const AtomicString& attributeValue = getAttribute(aria_currentAttr);
+  const AtomicString& attributeValue =
+      getAOMPropertyOrARIAAttribute(AOMStringProperty::kCurrent);
+  if (attributeValue.isNull())
+    return AriaCurrentStateUndefined;
   if (attributeValue.isEmpty() || equalIgnoringCase(attributeValue, "false"))
     return AriaCurrentStateFalse;
   if (equalIgnoringCase(attributeValue, "true"))
     return AriaCurrentStateTrue;
   if (equalIgnoringCase(attributeValue, "page"))
     return AriaCurrentStatePage;
   if (equalIgnoringCase(attributeValue, "step"))
     return AriaCurrentStateStep;
   if (equalIgnoringCase(attributeValue, "location"))
     return AriaCurrentStateLocation;
   if (equalIgnoringCase(attributeValue, "date"))
     return AriaCurrentStateDate;
   if (equalIgnoringCase(attributeValue, "time"))
     return AriaCurrentStateTime;
   // An unknown value should return true.
   if (!attributeValue.isEmpty())
     return AriaCurrentStateTrue;
 
   return AXObject::ariaCurrentState();
 }
 
 InvalidState AXNodeObject::getInvalidState() const {
-  if (hasAttribute(aria_invalidAttr)) {
-    const AtomicString& attributeValue = getAttribute(aria_invalidAttr);
-    if (equalIgnoringCase(attributeValue, "false"))
-      return InvalidStateFalse;
-    if (equalIgnoringCase(attributeValue, "true"))
-      return InvalidStateTrue;
-    if (equalIgnoringCase(attributeValue, "spelling"))
-      return InvalidStateSpelling;
-    if (equalIgnoringCase(attributeValue, "grammar"))
-      return InvalidStateGrammar;
-    // A yet unknown value.
-    if (!attributeValue.isEmpty())
-      return InvalidStateOther;
-  }
+  const AtomicString& attributeValue =
+      getAOMPropertyOrARIAAttribute(AOMStringProperty::kInvalid);
+  if (equalIgnoringCase(attributeValue, "false"))

[esprehn, 2017/04/04 06:22:30]

fwiw I think all of these should use ASCII case instead

[dmazzoni, 2017/04/04 18:59:17]

I can change this throughout modules/accessibility, I sent
you an email to clarify exactly what you want here.

+    return InvalidStateFalse;
+  if (equalIgnoringCase(attributeValue, "true"))
+    return InvalidStateTrue;
+  if (equalIgnoringCase(attributeValue, "spelling"))
+    return InvalidStateSpelling;
+  if (equalIgnoringCase(attributeValue, "grammar"))
+    return InvalidStateGrammar;
+  // A yet unknown value.
+  if (!attributeValue.isEmpty())
+    return InvalidStateOther;
 
   if (getNode() && getNode()->isElementNode() &&
       toElement(getNode())->isFormControlElement()) {
     HTMLFormControlElement* element = toHTMLFormControlElement(getNode());
     HeapVector<Member<HTMLFormControlElement>> invalidControls;
     bool isInvalid =
         !element->checkValidity(&invalidControls, CheckValidityDispatchNoEvent);
     return isInvalid ? InvalidStateTrue : InvalidStateFalse;
   }
 
@@ skipping 30 matching lines @@
       const auto& siblings = parentObject()->children();
       return siblings.size();
     }
   }
 
   return 0;
 }
 
 String AXNodeObject::ariaInvalidValue() const {
   if (getInvalidState() == InvalidStateOther)
-    return getAttribute(aria_invalidAttr);
+    return getAOMPropertyOrARIAAttribute(AOMStringProperty::kInvalid);
 
   return String();
 }
 
 String AXNodeObject::valueDescription() const {
   if (!supportsRangeValue())
     return String();
 
-  return getAttribute(aria_valuetextAttr).getString();
+  return getAOMPropertyOrARIAAttribute(AOMStringProperty::kValueText)
+      .getString();
 }
 
 float AXNodeObject::valueForRange() const {
   if (hasAttribute(aria_valuenowAttr))
     return getAttribute(aria_valuenowAttr).toFloat();
 
   if (isNativeSlider())
     return toHTMLInputElement(*getNode()).valueAsNumber();
 
   if (isHTMLMeterElement(getNode()))
@@ skipping 143 matching lines @@
   if (foundTextAlternative && !nameSources)
     return textAlternative;
 
   // Step 2E from: http://www.w3.org/TR/accname-aam-1.1
   if (recursive && !inAriaLabelledByTraversal && isControl() && !isButton()) {
     // No need to set any name source info in a recursive call.
     if (isTextControl())
       return text();
 
     if (isRange()) {
-      const AtomicString& ariaValuetext = getAttribute(aria_valuetextAttr);
+      const AtomicString& ariaValuetext =
+          getAOMPropertyOrARIAAttribute(AOMStringProperty::kValueText);
       if (!ariaValuetext.isNull())
         return ariaValuetext.getString();
       return String::number(valueForRange());
     }
 
     return stringValue();
   }
 
   // Step 2D from: http://www.w3.org/TR/accname-aam-1.1
   textAlternative = nativeTextAlternative(visited, nameFrom, relatedObjects,
@@ skipping 842 matching lines @@
 
     // Also check for aria-placeholder.
     nameFrom = AXNameFromPlaceholder;
     if (nameSources) {
       nameSources->push_back(
           NameSource(*foundTextAlternative, aria_placeholderAttr));
       NameSource& source = nameSources->back();
       source.type = nameFrom;
     }
     const AtomicString& ariaPlaceholder =
-        htmlElement->fastGetAttribute(aria_placeholderAttr);
+        getAOMPropertyOrARIAAttribute(AOMStringProperty::kPlaceholder);
     if (!ariaPlaceholder.isEmpty()) {
       textAlternative = ariaPlaceholder;
       if (nameSources) {
         NameSource& source = nameSources->back();
         source.text = textAlternative;
         source.attributeValue = ariaPlaceholder;
         *foundTextAlternative = true;
       } else {
         return textAlternative;
       }
@@ skipping 490 matching lines @@
     return String();
   return toTextControlElement(node)->strippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->trace(m_node);
   AXObject::trace(visitor);
 }
 
 }  // namespace blink