Implementation of new roles added in ARIA 1.1 draft.

Source/modules/accessibility/AXObject.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 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 89 matching lines @@
     { "option", ListBoxOptionRole },
     { "presentation", PresentationalRole },
     { "progressbar", ProgressIndicatorRole },
     { "radio", RadioButtonRole },
     { "radiogroup", RadioGroupRole },
     { "region", RegionRole },
     { "row", RowRole },
     { "rowheader", RowHeaderRole },
     { "scrollbar", ScrollBarRole },
     { "search", SearchRole },
+    { "searchbox", SearchBoxRole },
     { "separator", SplitterRole },
     { "slider", SliderRole },
     { "spinbutton", SpinButtonRole },
     { "status", StatusRole },
+    { "switch", SwitchRole },
     { "tab", TabRole },
     { "tablist", TabListRole },
     { "tabpanel", TabPanelRole },
     { "text", StaticTextRole },
     { "textbox", TextAreaRole },
     { "timer", TimerRole },
     { "toolbar", ToolbarRole },
     { "tooltip", UserInterfaceTooltipRole },
     { "tree", TreeRole },
     { "treegrid", TreeGridRole },
@@ skipping 129 matching lines @@
     m_detached = true;
 }
 
 bool AXObject::isDetached() const
 {
     return m_detached;
 }
 
 bool AXObject::isARIATextControl() const
 {
-    return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole;
+    return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchBoxRole;
 }
 
 bool AXObject::isButton() const
 {
     AccessibilityRole role = roleValue();
 
     return role == ButtonRole || role == PopUpButtonRole || role == ToggleButtonRole;
 }
 
 bool AXObject::isLandmarkRelated() const
@@ skipping 39 matching lines @@
 
     return isPasswordField();
 }
 
 bool AXObject::isTextControl() const
 {
     switch (roleValue()) {
     case TextAreaRole:
     case TextFieldRole:
     case ComboBoxRole:
+    case SearchBoxRole:
         return true;
     default:
         return false;
     }
 }
 
 bool AXObject::isClickable() const
 {
     switch (roleValue()) {
     case ButtonRole:
@@ skipping 142 matching lines @@
     switch (roleValue()) {
     case ButtonRole:
     case ToggleButtonRole:
         return queryString(WebLocalizedString::AXButtonActionVerb);
     case TextFieldRole:
     case TextAreaRole:
         return queryString(WebLocalizedString::AXTextFieldActionVerb);
     case RadioButtonRole:
         return queryString(WebLocalizedString::AXRadioButtonActionVerb);
     case CheckBoxRole:
+    case SwitchRole:
         return queryString(isChecked() ? WebLocalizedString::AXCheckedCheckBoxActionVerb : WebLocalizedString::AXUncheckedCheckBoxActionVerb);
     case LinkRole:
         return queryString(WebLocalizedString::AXLinkActionVerb);
     case PopUpButtonRole:
         // FIXME: Implement.
         return String();
     case MenuListPopupRole:
         // FIXME: Implement.
         return String();
     default:
         return emptyString();
     }
 }
 
 AccessibilityButtonState AXObject::checkboxOrRadioValue() const
 {
     // If this is a real checkbox or radio button, AXLayoutObject will handle.
     // If it's an ARIA checkbox or radio, the aria-checked attribute should be used.
 
     const AtomicString& result = getAttribute(aria_checkedAttr);
     if (equalIgnoringCase(result, "true"))
         return ButtonStateOn;
     if (equalIgnoringCase(result, "mixed")) {
         AccessibilityRole role = ariaRoleAttribute();
-        if (role == RadioButtonRole || role == MenuItemRadioRole)
+        if (role == RadioButtonRole || role == MenuItemRadioRole || role == SwitchRole)
             return ButtonStateOff;
         return ButtonStateMixed;
     }
 
     return ButtonStateOff;
 }
 
 bool AXObject::ariaIsMultiline() const
 {
     return equalIgnoringCase(getAttribute(aria_multilineAttr), "true");
@@ skipping 511 matching lines @@
 }
 
 bool AXObject::isARIAControl(AccessibilityRole ariaRole)
 {
     return isARIAInput(ariaRole) || ariaRole == TextAreaRole || ariaRole == ButtonRole
         || ariaRole == ComboBoxRole || ariaRole == SliderRole;
 }
 
 bool AXObject::isARIAInput(AccessibilityRole ariaRole)
 {
-    return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole;
+    return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole || ariaRole == SwitchRole || ariaRole ==  SearchBoxRole;
 }
 
 AccessibilityRole AXObject::ariaRoleToWebCoreRole(const String& value)
 {
     ASSERT(!value.isEmpty());
 
     static const ARIARoleMap* roleMap = createARIARoleMap();
 
     Vector<String> roleVector;
     value.split(' ', roleVector);
@@ skipping 65 matching lines @@
 }
 
 const AtomicString& AXObject::roleName(AccessibilityRole role)
 {
     static const Vector<AtomicString>* roleNameVector = createRoleNameVector();
 
     return roleNameVector->at(role);
 }
 
 } // namespace blink