Finish implementation and tests of 5 ARIA 1.1 attributes.

third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/accessibility/InspectorAccessibilityAgent.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Element.h"
@@ skipping 138 matching lines @@
          role == SwitchRole;
 }
 
 bool roleAllowsSelected(AccessibilityRole role) {
   return role == CellRole || role == ListBoxOptionRole || role == RowRole ||
          role == TabRole || role == ColumnHeaderRole ||
          role == MenuItemRadioRole || role == RadioButtonRole ||
          role == RowHeaderRole || role == TreeItemRole;
 }
 
+bool roleAllowsModal(AccessibilityRole role) {
+  return role == DialogRole || role == AlertDialogRole;
+}
+
 void fillWidgetProperties(AXObject& axObject,
                           protocol::Array<AXProperty>& properties) {
   AccessibilityRole role = axObject.roleValue();
   String autocomplete = axObject.ariaAutoComplete();
   if (!autocomplete.isEmpty())
     properties.addItem(
         createProperty(AXWidgetAttributesEnum::Autocomplete,
                        createValue(autocomplete, AXValueTypeEnum::Token)));
 
   if (axObject.hasAttribute(HTMLNames::aria_haspopupAttr)) {
@@ skipping 168 matching lines @@
 
   DEFINE_INLINE_TRACE() { visitor->trace(m_axObject); }
 
  private:
   Member<AXObject> m_axObject;
   protocol::Array<AXProperty>& m_properties;
 
   void addBoolAttribute(AXBoolAttribute attribute, bool value) {
     switch (attribute) {
       case AXBoolAttribute::AriaModal:
-        // TODO
+        if (roleAllowsModal(m_axObject->roleValue())) {
+          m_properties.addItem(createProperty(AXWidgetStatesEnum::Modal,
+                                              createBooleanValue(value)));
+        }
         break;
     }
   }
 
   void addStringAttribute(AXStringAttribute attribute, const String& value) {
     switch (attribute) {
       case AXStringAttribute::AriaKeyShortcuts:
-        // TODO
+        m_properties.addItem(createProperty(
+            AXWidgetAttributesEnum::Keyshortcuts, createValue(value)));
         break;
       case AXStringAttribute::AriaRoleDescription:
-        // TODO
+        m_properties.addItem(createProperty(
+            AXWidgetAttributesEnum::Roledescription, createValue(value)));
         break;
     }
   }
 
   void addObjectAttribute(AXObjectAttribute attribute, AXObject* object) {
     switch (attribute) {
       case AXObjectAttribute::AriaActiveDescendant:
         m_properties.addItem(
             createProperty(AXRelationshipAttributesEnum::Activedescendant,
                            createRelatedNodeListValue(*object)));
         break;
       case AXObjectAttribute::AriaErrorMessage:
-        // TODO
+        m_properties.addItem(
+            createProperty(AXRelationshipAttributesEnum::Errormessage,
+                           createRelatedNodeListValue(*object)));
         break;
     }
   }
 
   void addObjectVectorAttribute(AXObjectVectorAttribute attribute,
                                 HeapVector<Member<AXObject>>& objects) {
     switch (attribute) {
       case AXObjectVectorAttribute::AriaControls:
         m_properties.addItem(createRelatedNodeListProperty(
             AXRelationshipAttributesEnum::Controls, objects, aria_controlsAttr,
             *m_axObject));
         break;
       case AXObjectVectorAttribute::AriaDetails:
-        // TODO
+        m_properties.addItem(createRelatedNodeListProperty(
+            AXRelationshipAttributesEnum::Details, objects, aria_controlsAttr,
+            *m_axObject));
         break;
       case AXObjectVectorAttribute::AriaFlowTo:
         m_properties.addItem(createRelatedNodeListProperty(
             AXRelationshipAttributesEnum::Flowto, objects, aria_flowtoAttr,
             *m_axObject));
         break;
     }
   }
 };
 
@@ skipping 438 matching lines @@
   }
 }
 
 DEFINE_TRACE(InspectorAccessibilityAgent) {
   visitor->trace(m_page);
   visitor->trace(m_domAgent);
   InspectorBaseAgent::trace(visitor);
 }
 
 }  // namespace blink