Implement computedRole and computedName (behind a flag)

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 112 matching lines @@
         { "treegrid", TreeGridRole },
         { "treeitem", TreeItemRole }
     };
     ARIARoleMap* roleMap = new ARIARoleMap;
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(roles); ++i)
         roleMap->set(roles[i].ariaRole, roles[i].webcoreRole);
     return roleMap;
 }
 
-AXObject::AXObject()
+struct RoleNameEntry {
+    AccessibilityRole webcoreRole;
+    String roleName;
+};
+
+static Vector<AtomicString>* createRoleNameVector()
+{
+    const RoleNameEntry roleNames[] = {
+        { NoRole, "none" },

[dmazzoni, 2014/12/09 00:49:51]

Actually there is an ARIA role of "none" now, it means the same as
"presentational", and it's *not* the same as not having an ARIA role. I think
NoRole or UnknownRole should correspond to the empty string ""

[aboxhall, 2014/12/13 01:38:36]

Good point, although I note it doesn't seem to work, or be specced anywhere?

[dmazzoni, 2014/12/16 19:18:19]

The spec here:
http://www.w3.org/TR/wai-aria-1.1/#none

I'm not sure why you think it doesn't work - see further down in this array:

{ NoneRole, "none" },

I believe all of the places in the code that explicitly checked for
PresentationalRole now also check for NoneRole.

[aboxhall, 2014/12/16 23:56:37]

Ah - I didn't look at the 1.1 spec.

As discussed - this didn't work as I expected, but probably my expectations were
wrong, and regardless it does work in other places.

+        { AlertDialogRole, "alertDialog" },
+        { AlertRole, "alert" },
+        { AnnotationRole, "annotation" },
+        { ApplicationRole, "application" },
+        { ArticleRole, "article" },
+        { BannerRole, "banner" },
+        { BlockquoteRole, "blockquote" },
+        { BusyIndicatorRole, "busyIndicator" },
+        { ButtonRole, "button" },
+        { CanvasRole, "canvas" },
+        { CellRole, "cell" },
+        { CheckBoxRole, "checkBox" },
+        { ColorWellRole, "colorWell" },
+        { ColumnHeaderRole, "columnHeader" },
+        { ColumnRole, "column" },
+        { ComboBoxRole, "comboBox" },
+        { ComplementaryRole, "complementary" },
+        { ContentInfoRole, "contentInfo" },
+        { DateRole, "date" },
+        { DateTimeRole, "dateTime" },
+        { DefinitionRole, "definition" },
+        { DescriptionListDetailRole, "descriptionListDetail" },
+        { DescriptionListRole, "descriptionList" },
+        { DescriptionListTermRole, "descriptionListTerm" },
+        { DetailsRole, "details" },
+        { DialogRole, "dialog" },
+        { DirectoryRole, "directory" },
+        { DisclosureTriangleRole, "disclosureTriangle" },
+        { DivRole, "div" },
+        { DocumentRole, "document" },
+        { EmbeddedObjectRole, "embeddedObject" },
+        { FigcaptionRole, "figcaption" },
+        { FigureRole, "figure" },
+        { FooterRole, "footer" },
+        { FormRole, "form" },
+        { GridRole, "grid" },
+        { GroupRole, "group" },
+        { HeadingRole, "heading" },
+        { IframeRole, "iframe" },
+        { IgnoredRole, "ignored" },
+        { ImageMapLinkRole, "imageMapLink" },
+        { ImageMapRole, "imageMap" },
+        { ImageRole, "image" },
+        { InlineTextBoxRole, "inlineTextBox" },
+        { LabelRole, "label" },
+        { LegendRole, "legend" },
+        { LinkRole, "link" },
+        { ListBoxOptionRole, "listBoxOption" },
+        { ListBoxRole, "listBox" },
+        { ListItemRole, "listItem" },
+        { ListMarkerRole, "listMarker" },
+        { ListRole, "list" },
+        { LogRole, "log" },
+        { MainRole, "main" },
+        { MarqueeRole, "marquee" },
+        { MathElementRole, "mathElement" },
+        { MathRole, "math" },
+        { MenuBarRole, "menuBar" },
+        { MenuButtonRole, "menuButton" },
+        { MenuItemRole, "menuItem" },
+        { MenuItemCheckBoxRole, "menuItemCheckBox" },
+        { MenuItemRadioRole, "menuItemRadio" },
+        { MenuListOptionRole, "menuListOption" },
+        { MenuListPopupRole, "menuListPopup" },
+        { MenuRole, "menu" },
+        { MeterRole, "meter" },
+        { NavigationRole, "navigation" },
+        { NoneRole, "none" },
+        { NoteRole, "note" },
+        { OutlineRole, "outline" },
+        { ParagraphRole, "paragraph" },
+        { PopUpButtonRole, "popUpButton" },
+        { PreRole, "pre" },
+        { PresentationalRole, "presentational" },
+        { ProgressIndicatorRole, "progressIndicator" },
+        { RadioButtonRole, "radioButton" },
+        { RadioGroupRole, "radioGroup" },
+        { RegionRole, "region" },
+        { RootWebAreaRole, "rootWebArea" },
+        { RowHeaderRole, "rowHeader" },
+        { RowRole, "row" },
+        { RubyRole, "ruby" },
+        { RulerRole, "ruler" },
+        { SVGRootRole, "svgRoot" },
+        { ScrollAreaRole, "scrollArea" },
+        { ScrollBarRole, "scrollBar" },
+        { SeamlessWebAreaRole, "seamlessWebArea" },
+        { SearchRole, "search" },
+        { SliderRole, "slider" },
+        { SliderThumbRole, "sliderThumb" },
+        { SpinButtonPartRole, "spinButtonPart" },
+        { SpinButtonRole, "spinButton" },
+        { SplitterRole, "splitter" },
+        { StaticTextRole, "staticText" },
+        { StatusRole, "status" },
+        { TabGroupRole, "tabGroup" },
+        { TabListRole, "tabList" },
+        { TabPanelRole, "tabPanel" },
+        { TabRole, "tab" },
+        { TableHeaderContainerRole, "tableHeaderContainer" },
+        { TableRole, "table" },
+        { TextAreaRole, "textArea" },
+        { TextFieldRole, "textField" },
+        { TimeRole, "time" },
+        { TimerRole, "timer" },
+        { ToggleButtonRole, "toggleButton" },
+        { ToolbarRole, "toolbar" },
+        { TreeGridRole, "treeGrid" },
+        { TreeItemRole, "treeItem" },
+        { TreeRole, "tree" },
+        { UnknownRole, "unknown" },
+        { UserInterfaceTooltipRole, "userInterfaceTooltip" },
+        { WebAreaRole, "webArea" },
+        { WindowRole, "window" }
+    };
+    Vector<AtomicString>* roleNameVector = new Vector<AtomicString>(NumRoles);
+
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(roleNames); ++i) {
+        roleNameVector->insert(roleNames[i].webcoreRole,
+            AtomicString(roleNames[i].roleName));
+    }
+    return roleNameVector;
+}
+
+AXObject::AXObject(AXObjectCache* axObjectCache)
     : m_id(0)
     , m_haveChildren(false)
     , m_role(UnknownRole)
     , m_lastKnownIsIgnoredValue(DefaultBehavior)
     , m_detached(false)
     , m_parent(0)
     , m_lastModificationCount(-1)
     , m_cachedIsIgnored(false)
     , m_cachedLiveRegionRoot(0)
+    , m_axObjectCache(toAXObjectCacheImpl(axObjectCache))
 {
 }
 
 AXObject::~AXObject()
 {
     ASSERT(isDetached());
 }
 
 void AXObject::detach()
 {
     // Clear any children and call detachFromParent on them so that
     // no children are left with dangling pointers to their parent.
     clearChildren();
 
     m_detached = true;
 }
 
 bool AXObject::isDetached() const
 {
     return m_detached;
 }
 
 AXObjectCacheImpl* AXObject::axObjectCache() const
 {
-    Document* doc = document();
-    if (doc)
-        return toAXObjectCacheImpl(doc->axObjectCache());
-    return 0;
+    return m_axObjectCache;
 }
 
 bool AXObject::isARIATextControl() const
 {
     return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole;
 }
 
 bool AXObject::isButton() const
 {
     AccessibilityRole role = roleValue();
@@ skipping 790 matching lines @@
     if (ariaPressedIsPresent())
         return ToggleButtonRole;
     if (ariaHasPopup())
         return PopUpButtonRole;
     // We don't contemplate RadioButtonRole, as it depends on the input
     // type.
 
     return ButtonRole;
 }
 
+const AtomicString& AXObject::roleName(const AccessibilityRole role)
+{
+    static const Vector<AtomicString>* roleNameVector = createRoleNameVector();
+
+    return roleNameVector->at(role);
+}
+
 } // namespace blink