Finish implementation and tests of 5 ARIA 1.1 attributes.

content/renderer/accessibility/blink_ax_tree_source.cc

 // 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 "content/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 67 matching lines @@
 
   void addBoolAttribute(blink::WebAXBoolAttribute attribute,
                         bool value) override {
     NOTREACHED();
   }
 
   void addStringAttribute(blink::WebAXStringAttribute attribute,
                           const blink::WebString& value) override {
     switch (attribute) {
       case blink::WebAXStringAttribute::AriaKeyShortcuts:
-        // TODO(dmazzoni): implement aria-keyshortcuts. http://crbug.com/644766
+        dst_->AddStringAttribute(ui::AX_ATTR_KEY_SHORTCUTS, value.utf8());
         break;
       case blink::WebAXStringAttribute::AriaRoleDescription:
-        // TODO(dmazzoni): implement aria-roledescription.
-        // http://crbug.com/644766
+        dst_->AddStringAttribute(ui::AX_ATTR_ROLE_DESCRIPTION, value.utf8());
         break;
       default:
         NOTREACHED();
     }
   }
 
   void addObjectAttribute(blink::WebAXObjectAttribute attribute,
                           const blink::WebAXObject& value) override {
     switch (attribute) {
       case blink::WebAXObjectAttribute::AriaActiveDescendant:
         dst_->AddIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID, value.axID());
         break;
       case blink::WebAXObjectAttribute::AriaErrorMessage:
-        // TODO(dmazzoni): implement aria-errormessage.
-        // http://crbug.com/644766
+        dst_->AddIntAttribute(ui::AX_ATTR_ERRORMESSAGE_ID, value.axID());
         break;
       default:
         NOTREACHED();
     }
   }
 
   void addObjectVectorAttribute(
       blink::WebAXObjectVectorAttribute attribute,
       const blink::WebVector<WebAXObject>& value) override {
     switch (attribute) {
       case blink::WebAXObjectVectorAttribute::AriaControls:
         AddIntListAttributeFromWebObjects(ui::AX_ATTR_CONTROLS_IDS, value,
                                           dst_);
         break;
       case blink::WebAXObjectVectorAttribute::AriaDetails:
-        // TODO(dmazzoni): implement aria-details. http://crbug.com/644766
+        AddIntListAttributeFromWebObjects(ui::AX_ATTR_DETAILS_IDS, value,
+                                          dst_);
         break;
       case blink::WebAXObjectVectorAttribute::AriaFlowTo:
         AddIntListAttributeFromWebObjects(ui::AX_ATTR_FLOWTO_IDS, value, dst_);
         break;
       default:
         NOTREACHED();
     }
   }
 };
 
@@ skipping 506 matching lines @@
         dst->role == ui::AX_ROLE_SCROLL_BAR ||
         dst->role == ui::AX_ROLE_SLIDER ||
         dst->role == ui::AX_ROLE_SPIN_BUTTON) {
       dst->AddFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE, src.valueForRange());
       dst->AddFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE,
                              src.maxValueForRange());
       dst->AddFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE,
                              src.minValueForRange());
     }
 
+    if (dst->role == ui::AX_ROLE_DIALOG ||
+        dst->role == ui::AX_ROLE_ALERT_DIALOG) {
+      dst->AddBoolAttribute(ui::AX_ATTR_MODAL, src.isModal());
+    }
+
     if (dst->role == ui::AX_ROLE_ROOT_WEB_AREA)
       dst->AddStringAttribute(ui::AX_ATTR_HTML_TAG, "#document");
 
     if (dst->role == ui::AX_ROLE_TABLE) {
       int column_count = src.columnCount();
       int row_count = src.rowCount();
       if (column_count > 0 && row_count > 0) {
         std::set<int32_t> unique_cell_id_set;
         std::vector<int32_t> cell_ids;
         std::vector<int32_t> unique_cell_ids;
@@ skipping 197 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->document();
   if (!document.isNull())
     return document.accessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content