Add support for new accessibility roles from WebKit, with tests.

content/renderer/accessibility_node_serializer.cc

 // Copyright (c) 2012 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_node_serializer.h"
 
 #include <set>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 57 matching lines @@
     case WebKit::WebAccessibilityRoleApplicationStatus:
       return AccessibilityNodeData::ROLE_STATUS;
     case WebKit::WebAccessibilityRoleApplicationTimer:
       return AccessibilityNodeData::ROLE_TIMER;
     case WebKit::WebAccessibilityRoleBrowser:
       return AccessibilityNodeData::ROLE_BROWSER;
     case WebKit::WebAccessibilityRoleBusyIndicator:
       return AccessibilityNodeData::ROLE_BUSY_INDICATOR;
     case WebKit::WebAccessibilityRoleButton:
       return AccessibilityNodeData::ROLE_BUTTON;
+    case WebKit::WebAccessibilityRoleCanvas:
+      return AccessibilityNodeData::ROLE_CANVAS;
     case WebKit::WebAccessibilityRoleCell:
       return AccessibilityNodeData::ROLE_CELL;
     case WebKit::WebAccessibilityRoleCheckBox:
       return AccessibilityNodeData::ROLE_CHECKBOX;
     case WebKit::WebAccessibilityRoleColorWell:
       return AccessibilityNodeData::ROLE_COLOR_WELL;
     case WebKit::WebAccessibilityRoleColumn:
       return AccessibilityNodeData::ROLE_COLUMN;
     case WebKit::WebAccessibilityRoleColumnHeader:
       return AccessibilityNodeData::ROLE_COLUMN_HEADER;
     case WebKit::WebAccessibilityRoleComboBox:
       return AccessibilityNodeData::ROLE_COMBO_BOX;
     case WebKit::WebAccessibilityRoleDefinitionListDefinition:
       return AccessibilityNodeData::ROLE_DEFINITION_LIST_DEFINITION;
     case WebKit::WebAccessibilityRoleDefinitionListTerm:
       return AccessibilityNodeData::ROLE_DEFINITION_LIST_TERM;
     case WebKit::WebAccessibilityRoleDirectory:
       return AccessibilityNodeData::ROLE_DIRECTORY;
     case WebKit::WebAccessibilityRoleDisclosureTriangle:
       return AccessibilityNodeData::ROLE_DISCLOSURE_TRIANGLE;
+    case WebKit::WebAccessibilityRoleDiv:
+      return AccessibilityNodeData::ROLE_DIV;
     case WebKit::WebAccessibilityRoleDocument:
       return AccessibilityNodeData::ROLE_DOCUMENT;
     case WebKit::WebAccessibilityRoleDocumentArticle:
       return AccessibilityNodeData::ROLE_ARTICLE;
     case WebKit::WebAccessibilityRoleDocumentMath:
       return AccessibilityNodeData::ROLE_MATH;
     case WebKit::WebAccessibilityRoleDocumentNote:
       return AccessibilityNodeData::ROLE_NOTE;
     case WebKit::WebAccessibilityRoleDocumentRegion:
       return AccessibilityNodeData::ROLE_REGION;
     case WebKit::WebAccessibilityRoleDrawer:
       return AccessibilityNodeData::ROLE_DRAWER;
     case WebKit::WebAccessibilityRoleEditableText:
       return AccessibilityNodeData::ROLE_EDITABLE_TEXT;
     case WebKit::WebAccessibilityRoleFooter:
       return AccessibilityNodeData::ROLE_FOOTER;
+    case WebKit::WebAccessibilityRoleForm:
+      return AccessibilityNodeData::ROLE_FORM;
     case WebKit::WebAccessibilityRoleGrid:
       return AccessibilityNodeData::ROLE_GRID;
     case WebKit::WebAccessibilityRoleGroup:
       return AccessibilityNodeData::ROLE_GROUP;
     case WebKit::WebAccessibilityRoleGrowArea:
       return AccessibilityNodeData::ROLE_GROW_AREA;
     case WebKit::WebAccessibilityRoleHeading:
       return AccessibilityNodeData::ROLE_HEADING;
     case WebKit::WebAccessibilityRoleHelpTag:
       return AccessibilityNodeData::ROLE_HELP_TAG;
+    case WebKit::WebAccessibilityRoleHorizontalRule:
+      return AccessibilityNodeData::ROLE_HORIZONTAL_RULE;
     case WebKit::WebAccessibilityRoleIgnored:
       return AccessibilityNodeData::ROLE_IGNORED;
     case WebKit::WebAccessibilityRoleImage:
       return AccessibilityNodeData::ROLE_IMAGE;
     case WebKit::WebAccessibilityRoleImageMap:
       return AccessibilityNodeData::ROLE_IMAGE_MAP;
     case WebKit::WebAccessibilityRoleImageMapLink:
       return AccessibilityNodeData::ROLE_IMAGE_MAP_LINK;
     case WebKit::WebAccessibilityRoleIncrementor:
       return AccessibilityNodeData::ROLE_INCREMENTOR;
+    case WebKit::WebAccessibilityRoleLabel:
+      return AccessibilityNodeData::ROLE_LABEL;
     case WebKit::WebAccessibilityRoleLandmarkApplication:
       return AccessibilityNodeData::ROLE_LANDMARK_APPLICATION;
     case WebKit::WebAccessibilityRoleLandmarkBanner:
       return AccessibilityNodeData::ROLE_LANDMARK_BANNER;
     case WebKit::WebAccessibilityRoleLandmarkComplementary:
       return AccessibilityNodeData::ROLE_LANDMARK_COMPLEMENTARY;
     case WebKit::WebAccessibilityRoleLandmarkContentInfo:
       return AccessibilityNodeData::ROLE_LANDMARK_CONTENTINFO;
     case WebKit::WebAccessibilityRoleLandmarkMain:
       return AccessibilityNodeData::ROLE_LANDMARK_MAIN;
@@ skipping 22 matching lines @@
     case WebKit::WebAccessibilityRoleMenuButton:
       return AccessibilityNodeData::ROLE_MENU_BUTTON;
     case WebKit::WebAccessibilityRoleMenuItem:
       return AccessibilityNodeData::ROLE_MENU_ITEM;
     case WebKit::WebAccessibilityRoleMenuListOption:
       return AccessibilityNodeData::ROLE_MENU_LIST_OPTION;
     case WebKit::WebAccessibilityRoleMenuListPopup:
       return AccessibilityNodeData::ROLE_MENU_LIST_POPUP;
     case WebKit::WebAccessibilityRoleOutline:
       return AccessibilityNodeData::ROLE_OUTLINE;
+    case WebKit::WebAccessibilityRoleParagraph:
+      return AccessibilityNodeData::ROLE_PARAGRAPH;
     case WebKit::WebAccessibilityRolePopUpButton:
       return AccessibilityNodeData::ROLE_POPUP_BUTTON;
+    case WebKit::WebAccessibilityRolePresentational:
+      return AccessibilityNodeData::ROLE_PRESENTATIONAL;
     case WebKit::WebAccessibilityRoleProgressIndicator:
       return AccessibilityNodeData::ROLE_PROGRESS_INDICATOR;
     case WebKit::WebAccessibilityRoleRadioButton:
       return AccessibilityNodeData::ROLE_RADIO_BUTTON;
     case WebKit::WebAccessibilityRoleRadioGroup:
       return AccessibilityNodeData::ROLE_RADIO_GROUP;
     case WebKit::WebAccessibilityRoleRow:
       return AccessibilityNodeData::ROLE_ROW;
     case WebKit::WebAccessibilityRoleRowHeader:
       return AccessibilityNodeData::ROLE_ROW_HEADER;
     case WebKit::WebAccessibilityRoleRuler:
       return AccessibilityNodeData::ROLE_RULER;
     case WebKit::WebAccessibilityRoleRulerMarker:
       return AccessibilityNodeData::ROLE_RULER_MARKER;
     case WebKit::WebAccessibilityRoleScrollArea:
       return AccessibilityNodeData::ROLE_SCROLLAREA;
     case WebKit::WebAccessibilityRoleScrollBar:
       return AccessibilityNodeData::ROLE_SCROLLBAR;
     case WebKit::WebAccessibilityRoleSheet:
       return AccessibilityNodeData::ROLE_SHEET;
     case WebKit::WebAccessibilityRoleSlider:
       return AccessibilityNodeData::ROLE_SLIDER;
     case WebKit::WebAccessibilityRoleSliderThumb:
       return AccessibilityNodeData::ROLE_SLIDER_THUMB;
+    case WebKit::WebAccessibilityRoleSpinButton:
+      return AccessibilityNodeData::ROLE_SPIN_BUTTON;
+    case WebKit::WebAccessibilityRoleSpinButtonPart:
+      return AccessibilityNodeData::ROLE_SPIN_BUTTON_PART;
     case WebKit::WebAccessibilityRoleSplitGroup:
       return AccessibilityNodeData::ROLE_SPLIT_GROUP;
     case WebKit::WebAccessibilityRoleSplitter:
       return AccessibilityNodeData::ROLE_SPLITTER;
     case WebKit::WebAccessibilityRoleStaticText:
       return AccessibilityNodeData::ROLE_STATIC_TEXT;
     case WebKit::WebAccessibilityRoleSystemWide:
       return AccessibilityNodeData::ROLE_SYSTEM_WIDE;
     case WebKit::WebAccessibilityRoleTab:
       return AccessibilityNodeData::ROLE_TAB;
     case WebKit::WebAccessibilityRoleTabGroup:
       return AccessibilityNodeData::ROLE_TAB_GROUP_UNUSED;
     case WebKit::WebAccessibilityRoleTabList:
       return AccessibilityNodeData::ROLE_TAB_LIST;
     case WebKit::WebAccessibilityRoleTabPanel:
       return AccessibilityNodeData::ROLE_TAB_PANEL;
     case WebKit::WebAccessibilityRoleTable:
       return AccessibilityNodeData::ROLE_TABLE;
     case WebKit::WebAccessibilityRoleTableHeaderContainer:
       return AccessibilityNodeData::ROLE_TABLE_HEADER_CONTAINER;
     case WebKit::WebAccessibilityRoleTextArea:
       return AccessibilityNodeData::ROLE_TEXTAREA;
     case WebKit::WebAccessibilityRoleTextField:
       return AccessibilityNodeData::ROLE_TEXT_FIELD;
+    case WebKit::WebAccessibilityRoleToggleButton:
+      return AccessibilityNodeData::ROLE_TOGGLE_BUTTON;
     case WebKit::WebAccessibilityRoleToolbar:
       return AccessibilityNodeData::ROLE_TOOLBAR;
     case WebKit::WebAccessibilityRoleTreeGrid:
       return AccessibilityNodeData::ROLE_TREE_GRID;
     case WebKit::WebAccessibilityRoleTreeItemRole:
       return AccessibilityNodeData::ROLE_TREE_ITEM;
     case WebKit::WebAccessibilityRoleTreeRole:
       return AccessibilityNodeData::ROLE_TREE;
     case WebKit::WebAccessibilityRoleUserInterfaceTooltip:
       return AccessibilityNodeData::ROLE_TOOLTIP;
@@ skipping 134 matching lines @@
   if (dst->role == dst->ROLE_TREE_ITEM)
     dst->int_attributes[dst->ATTR_HIERARCHICAL_LEVEL] = src.hierarchicalLevel();
 
   if (dst->role == dst->ROLE_SLIDER)
     include_children = false;
 
   // Treat the active list box item as focused.
   if (dst->role == dst->ROLE_LISTBOX_OPTION && src.isSelectedOptionActive())
     dst->state |= (1 << AccessibilityNodeData::STATE_FOCUSED);
 
+  //if (src.canvasHasFallbackContent())
+  //  dst->role = AccessibilityNodeData::ROLE_CANVAS_WITH_FALLBACK_CONTENT;

[piman, 2012/09/07 21:19:33]

Nit: remove commented code

+
   WebNode node = src.node();
   bool is_iframe = false;
 
   if (!node.isNull() && node.isElementNode()) {
     WebElement element = node.to<WebElement>();
     is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME"));
 
     // TODO(ctguil): The tagName in WebKit is lower cased but
     // HTMLElement::nodeName calls localNameUpper. Consider adding
     // a WebElement method that returns the original lower cased tagName.
@@ skipping 80 matching lines @@
           dst->string_attributes.end()) {
         dst->string_attributes[dst->ATTR_CONTAINER_LIVE_RELEVANT] =
             container_elem.getAttribute("aria-relevant");
       }
     }
     container_accessible = container_accessible.parentObject();
   }
 
   if (dst->role == dst->ROLE_PROGRESS_INDICATOR ||
       dst->role == dst->ROLE_SCROLLBAR ||
-      dst->role == dst->ROLE_SLIDER) {
+      dst->role == dst->ROLE_SLIDER ||
+      dst->role == dst->ROLE_SPIN_BUTTON) {
     dst->float_attributes[dst->ATTR_VALUE_FOR_RANGE] = src.valueForRange();
     dst->float_attributes[dst->ATTR_MAX_VALUE_FOR_RANGE] =
         src.minValueForRange();
     dst->float_attributes[dst->ATTR_MIN_VALUE_FOR_RANGE] =
         src.maxValueForRange();
   }
 
   if (dst->role == dst->ROLE_DOCUMENT ||
       dst->role == dst->ROLE_WEB_AREA) {
     const WebDocument& document = src.document();
@@ skipping 94 matching lines @@
                                    &dst->children.back(),
                                    include_children);
       } else {
         dst->indirect_child_ids.push_back(child_id);
       }
     }
   }
 }
 
 }  // namespace content