Implementation of new roles added in ARIA 1.1 draft.

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 676 matching lines @@
 bool AXNodeObject::isChecked() const
 {
     Node* node = this->node();
     if (!node)
         return false;
 
     // First test for native checkedness semantics
     if (isHTMLInputElement(*node))
         return toHTMLInputElement(*node).shouldAppearChecked();
 
-    // Else, if this is an ARIA checkbox or radio OR ARIA role menuitemcheckbox
-    // or menuitemradio, respect the aria-checked attribute
-    AccessibilityRole ariaRole = ariaRoleAttribute();
-    if (ariaRole == RadioButtonRole || ariaRole == CheckBoxRole
-        || ariaRole == MenuItemCheckBoxRole || ariaRole == MenuItemRadioRole) {
+    // 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"))
             return true;
         return false;
+    default:
+        break;
     }
 
     // Otherwise it's not checked
     return false;
 }
 
 bool AXNodeObject::isClickable() const
 {
     if (node()) {
         if (node()->isElementNode() && toElement(node())->isDisabledFormControl())
@@ skipping 698 matching lines @@
     case ButtonRole:
     case ToggleButtonRole:
     case CheckBoxRole:
     case ListBoxOptionRole:
     case ListItemRole:
     case MenuButtonRole:
     case MenuItemRole:
     case MenuItemCheckBoxRole:
     case MenuItemRadioRole:
     case RadioButtonRole:
+    case SwitchRole:
     case TabRole:
         return textUnderElement(mode);
     // SVGRoots should not use the text under itself as a title. That could include the text of objects like <text>.
     case SVGRootRole:
         return String();
     case FigureRole: {
         AXObject* figcaption = findChildWithTagName(figcaptionTag);
         if (figcaption)
             return figcaption->textUnderElement();
     }
@@ skipping 235 matching lines @@
     if (!node() && !isAXLayoutObject())
         return false;
 
     // Elements that should not have children
     switch (roleValue()) {
     case ImageRole:
     case ButtonRole:
     case PopUpButtonRole:
     case CheckBoxRole:
     case RadioButtonRole:
+    case SwitchRole:
     case TabRole:
     case ToggleButtonRole:
     case ListBoxOptionRole:
     case ScrollBarRole:
         return false;
     case StaticTextRole:
         if (!axObjectCache()->inlineTextBoxAccessibilityEnabled())
             return false;
     default:
         return true;
@@ skipping 300 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