Use Blink accessibility enums in Chromium

content/renderer/accessibility/accessibility_node_serializer.cc

Index: content/renderer/accessibility/accessibility_node_serializer.cc
diff --git a/content/renderer/accessibility/accessibility_node_serializer.cc b/content/renderer/accessibility/accessibility_node_serializer.cc
index e6cca96adf376a568654665f9cbb151b8cd95330..dd585c56070f031fb3be64bf6833ed83c6400f19 100644
--- a/content/renderer/accessibility/accessibility_node_serializer.cc
+++ b/content/renderer/accessibility/accessibility_node_serializer.cc
@@ -13,8 +13,8 @@
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
-#include "third_party/WebKit/public/web/WebAccessibilityObject.h"
-#include "third_party/WebKit/public/web/WebAccessibilityRole.h"
+#include "third_party/WebKit/public/web/WebAXEnums.h"
+#include "third_party/WebKit/public/web/WebAXObject.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebDocumentType.h"
 #include "third_party/WebKit/public/web/WebElement.h"
@@ -23,8 +23,7 @@
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 
-using WebKit::WebAccessibilityRole;
-using WebKit::WebAccessibilityObject;
+using WebKit::WebAXObject;
 using WebKit::WebDocument;
 using WebKit::WebDocumentType;
 using WebKit::WebElement;
@@ -38,9 +37,9 @@ namespace {
 // which means that when walking up the parent chain from |child|,
 // |ancestor| is the *first* ancestor that isn't marked as
 // accessibilityIsIgnored().
-bool IsParentUnignoredOf(const WebAccessibilityObject& ancestor,
-                         const WebAccessibilityObject& child) {
-  WebAccessibilityObject parent = child.parentObject();
+bool IsParentUnignoredOf(const WebAXObject& ancestor,
+                         const WebAXObject& child) {
+  WebAXObject parent = child.parentObject();
   while (!parent.isDetached() && parent.accessibilityIsIgnored())
     parent = parent.parentObject();
   return parent.equals(ancestor);
@@ -50,302 +49,77 @@ bool IsParentUnignoredOf(const WebAccessibilityObject& ancestor,
   return LowerCaseEqualsASCII(html_value, "true");
 }
 
-// Provides a conversion between the WebKit::WebAccessibilityRole and a role
-// supported on the Browser side. Listed alphabetically by the
-// WebKit::WebAccessibilityRole (except for default role).
-AccessibilityNodeData::Role ConvertRole(WebKit::WebAccessibilityRole role) {
-  switch (role) {
-    case WebKit::WebAccessibilityRoleAnnotation:
-      return AccessibilityNodeData::ROLE_ANNOTATION;
-    case WebKit::WebAccessibilityRoleApplication:
-      return AccessibilityNodeData::ROLE_APPLICATION;
-    case WebKit::WebAccessibilityRoleApplicationAlert:
-      return AccessibilityNodeData::ROLE_ALERT;
-    case WebKit::WebAccessibilityRoleApplicationAlertDialog:
-      return AccessibilityNodeData::ROLE_ALERT_DIALOG;
-    case WebKit::WebAccessibilityRoleApplicationDialog:
-      return AccessibilityNodeData::ROLE_DIALOG;
-    case WebKit::WebAccessibilityRoleApplicationLog:
-      return AccessibilityNodeData::ROLE_LOG;
-    case WebKit::WebAccessibilityRoleApplicationMarquee:
-      return AccessibilityNodeData::ROLE_MARQUEE;
-    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::WebAccessibilityRoleDefinition:
-      return AccessibilityNodeData::ROLE_DEFINITION;
-    case WebKit::WebAccessibilityRoleDescriptionListTerm:
-      return AccessibilityNodeData::ROLE_DESCRIPTION_LIST_TERM;
-    case WebKit::WebAccessibilityRoleDescriptionListDetail:
-      return AccessibilityNodeData::ROLE_DESCRIPTION_LIST_DETAIL;
-    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;
-    case WebKit::WebAccessibilityRoleLandmarkNavigation:
-      return AccessibilityNodeData::ROLE_LANDMARK_NAVIGATION;
-    case WebKit::WebAccessibilityRoleLandmarkSearch:
-      return AccessibilityNodeData::ROLE_LANDMARK_SEARCH;
-    case WebKit::WebAccessibilityRoleLink:
-      return AccessibilityNodeData::ROLE_LINK;
-    case WebKit::WebAccessibilityRoleList:
-      return AccessibilityNodeData::ROLE_LIST;
-    case WebKit::WebAccessibilityRoleListBox:
-      return AccessibilityNodeData::ROLE_LISTBOX;
-    case WebKit::WebAccessibilityRoleListBoxOption:
-      return AccessibilityNodeData::ROLE_LISTBOX_OPTION;
-    case WebKit::WebAccessibilityRoleListItem:
-      return AccessibilityNodeData::ROLE_LIST_ITEM;
-    case WebKit::WebAccessibilityRoleListMarker:
-      return AccessibilityNodeData::ROLE_LIST_MARKER;
-    case WebKit::WebAccessibilityRoleMatte:
-      return AccessibilityNodeData::ROLE_MATTE;
-    case WebKit::WebAccessibilityRoleMenu:
-      return AccessibilityNodeData::ROLE_MENU;
-    case WebKit::WebAccessibilityRoleMenuBar:
-      return AccessibilityNodeData::ROLE_MENU_BAR;
-    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::WebAccessibilityRoleSVGRoot:
-      return AccessibilityNodeData::ROLE_SVG_ROOT;
-    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;
-    case WebKit::WebAccessibilityRoleValueIndicator:
-      return AccessibilityNodeData::ROLE_VALUE_INDICATOR;
-    case WebKit::WebAccessibilityRoleWebArea:
-      return AccessibilityNodeData::ROLE_WEB_AREA;
-    case WebKit::WebAccessibilityRoleWebCoreLink:
-      return AccessibilityNodeData::ROLE_WEBCORE_LINK;
-    case WebKit::WebAccessibilityRoleWindow:
-      return AccessibilityNodeData::ROLE_WINDOW;
-
-    default:
-      return AccessibilityNodeData::ROLE_UNKNOWN;
-  }
-}
-
-// Provides a conversion between the WebAccessibilityObject state
+// Provides a conversion between the WebAXObject state
 // accessors and a state bitmask that can be serialized and sent to the
 // Browser process. Rare state are sent as boolean attributes instead.
-uint32 ConvertState(const WebAccessibilityObject& o) {
+uint32 ConvertState(const WebAXObject& o) {
   uint32 state = 0;
   if (o.isChecked())
-    state |= (1 << AccessibilityNodeData::STATE_CHECKED);
+    state |= (1 << WebKit::WebAXStateChecked);
 
   if (o.isCollapsed())
-    state |= (1 << AccessibilityNodeData::STATE_COLLAPSED);
+    state |= (1 << WebKit::WebAXStateCollapsed);
 
   if (o.canSetFocusAttribute())
-    state |= (1 << AccessibilityNodeData::STATE_FOCUSABLE);
+    state |= (1 << WebKit::WebAXStateFocusable);
 
   if (o.isFocused())
-    state |= (1 << AccessibilityNodeData::STATE_FOCUSED);
+    state |= (1 << WebKit::WebAXStateFocused);
 
-  if (o.roleValue() == WebKit::WebAccessibilityRolePopUpButton ||
+  if (o.role() == WebKit::WebAXRolePopUpButton ||
       o.ariaHasPopup()) {
-    state |= (1 << AccessibilityNodeData::STATE_HASPOPUP);
+    state |= (1 << WebKit::WebAXStateHaspopup);
     if (!o.isCollapsed())
-      state |= (1 << AccessibilityNodeData::STATE_EXPANDED);
+      state |= (1 << WebKit::WebAXStateExpanded);
   }
 
   if (o.isHovered())
-    state |= (1 << AccessibilityNodeData::STATE_HOTTRACKED);
+    state |= (1 << WebKit::WebAXStateHovered);
 
   if (o.isIndeterminate())
-    state |= (1 << AccessibilityNodeData::STATE_INDETERMINATE);
+    state |= (1 << WebKit::WebAXStateIndeterminate);
 
   if (!o.isVisible())
-    state |= (1 << AccessibilityNodeData::STATE_INVISIBLE);
+    state |= (1 << WebKit::WebAXStateInvisible);
 
   if (o.isLinked())
-    state |= (1 << AccessibilityNodeData::STATE_LINKED);
+    state |= (1 << WebKit::WebAXStateLinked);
 
   if (o.isMultiSelectable())
-    state |= (1 << AccessibilityNodeData::STATE_MULTISELECTABLE);
+    state |= (1 << WebKit::WebAXStateMultiselectable);
 
   if (o.isOffScreen())
-    state |= (1 << AccessibilityNodeData::STATE_OFFSCREEN);
+    state |= (1 << WebKit::WebAXStateOffscreen);
 
   if (o.isPressed())
-    state |= (1 << AccessibilityNodeData::STATE_PRESSED);
+    state |= (1 << WebKit::WebAXStatePressed);
 
   if (o.isPasswordField())
-    state |= (1 << AccessibilityNodeData::STATE_PROTECTED);
+    state |= (1 << WebKit::WebAXStateProtected);
 
   if (o.isReadOnly())
-    state |= (1 << AccessibilityNodeData::STATE_READONLY);
+    state |= (1 << WebKit::WebAXStateReadonly);
 
   if (o.isRequired())
-    state |= (1 << AccessibilityNodeData::STATE_REQUIRED);
+    state |= (1 << WebKit::WebAXStateRequired);
 
   if (o.canSetSelectedAttribute())
-    state |= (1 << AccessibilityNodeData::STATE_SELECTABLE);
+    state |= (1 << WebKit::WebAXStateSelectable);
 
   if (o.isSelected())
-    state |= (1 << AccessibilityNodeData::STATE_SELECTED);
+    state |= (1 << WebKit::WebAXStateSelected);
 
   if (o.isVisited())
-    state |= (1 << AccessibilityNodeData::STATE_TRAVERSED);
+    state |= (1 << WebKit::WebAXStateVisited);
 
-  if (!o.isEnabled())
-    state |= (1 << AccessibilityNodeData::STATE_UNAVAILABLE);
+  if (o.isEnabled())
+    state |= (1 << WebKit::WebAXStateEnabled);
 
   if (o.isVertical())
-    state |= (1 << AccessibilityNodeData::STATE_VERTICAL);
+    state |= (1 << WebKit::WebAXStateVertical);
 
   if (o.isVisited())
-    state |= (1 << AccessibilityNodeData::STATE_VISITED);
+    state |= (1 << WebKit::WebAXStateVisited);
 
   return state;
 }
@@ -353,9 +127,9 @@ uint32 ConvertState(const WebAccessibilityObject& o) {
 }  // Anonymous namespace
 
 void SerializeAccessibilityNode(
-    const WebAccessibilityObject& src,
+    const WebAXObject& src,
     AccessibilityNodeData* dst) {
-  dst->role = ConvertRole(src.roleValue());
+  dst->role = src.role();
   dst->state = ConvertState(src);
   dst->location = src.boundingBoxRect();
   dst->id = src.axID();
@@ -369,7 +143,7 @@ void SerializeAccessibilityNode(
     dst->AddStringAttribute(dst->ATTR_VALUE, UTF16ToUTF8(src.stringValue()));
   }
 
-  if (dst->role == AccessibilityNodeData::ROLE_COLOR_WELL) {
+  if (dst->role == WebKit::WebAXRoleColorWell) {
     int r, g, b;
     src.colorValue(r, g, b);
     dst->AddIntAttribute(dst->ATTR_COLOR_VALUE_RED, r);
@@ -408,19 +182,22 @@ void SerializeAccessibilityNode(
   if (!src.url().isEmpty())
     dst->AddStringAttribute(dst->ATTR_URL, src.url().spec());
 
-  if (dst->role == dst->ROLE_HEADING)
+  if (dst->role == WebKit::WebAXRoleHeading)
     dst->AddIntAttribute(dst->ATTR_HIERARCHICAL_LEVEL, src.headingLevel());
-  else if ((dst->role == dst->ROLE_TREE_ITEM || dst->role == dst->ROLE_ROW) &&
+  else if ((dst->role == WebKit::WebAXRoleTreeItem ||
+            dst->role == WebKit::WebAXRoleRow) &&
            src.hierarchicalLevel() > 0) {
     dst->AddIntAttribute(dst->ATTR_HIERARCHICAL_LEVEL, src.hierarchicalLevel());
   }
 
   // Treat the active list box item as focused.
-  if (dst->role == dst->ROLE_LISTBOX_OPTION && src.isSelectedOptionActive())
-    dst->state |= (1 << AccessibilityNodeData::STATE_FOCUSED);
+  if (dst->role == WebKit::WebAXRoleListBoxOption &&
+      src.isSelectedOptionActive()) {
+    dst->state |= (1 << WebKit::WebAXStateFocused);
+  }
 
   if (src.canvasHasFallbackContent())
-    dst->role = AccessibilityNodeData::ROLE_CANVAS_WITH_FALLBACK_CONTENT;
+    dst->role = WebKit::WebAXRoleCanvas;
 
   WebNode node = src.node();
   bool is_iframe = false;
@@ -434,7 +211,7 @@ void SerializeAccessibilityNode(
     is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME"));
 
     if (LowerCaseEqualsASCII(element.getAttribute("aria-expanded"), "true"))
-      dst->state |= (1 << AccessibilityNodeData::STATE_EXPANDED);
+      dst->state |= (1 << WebKit::WebAXStateExpanded);
 
     // TODO(ctguil): The tagName in WebKit is lower cased but
     // HTMLElement::nodeName calls localNameUpper. Consider adding
@@ -449,9 +226,9 @@ void SerializeAccessibilityNode(
       dst->html_attributes.push_back(std::make_pair(name, value));
     }
 
-    if (dst->role == dst->ROLE_EDITABLE_TEXT ||
-        dst->role == dst->ROLE_TEXTAREA ||
-        dst->role == dst->ROLE_TEXT_FIELD) {
+    if (dst->role == WebKit::WebAXRoleEditableText ||
+        dst->role == WebKit::WebAXRoleTextArea ||
+        dst->role == WebKit::WebAXRoleTextField) {
       dst->AddIntAttribute(dst->ATTR_TEXT_SEL_START, src.selectionStart());
       dst->AddIntAttribute(dst->ATTR_TEXT_SEL_END, src.selectionEnd());
 
@@ -484,7 +261,7 @@ void SerializeAccessibilityNode(
   std::string container_live_busy;
   std::string container_live_status;
   std::string container_live_relevant;
-  WebAccessibilityObject container_accessible = src;
+  WebAXObject container_accessible = src;
   while (!container_accessible.isDetached()) {
     WebNode container_node = container_accessible.node();
     if (!container_node.isNull() && container_node.isElementNode()) {
@@ -539,10 +316,10 @@ void SerializeAccessibilityNode(
                             container_live_relevant);
   }
 
-  if (dst->role == dst->ROLE_PROGRESS_INDICATOR ||
-      dst->role == dst->ROLE_SCROLLBAR ||
-      dst->role == dst->ROLE_SLIDER ||
-      dst->role == dst->ROLE_SPIN_BUTTON) {
+  if (dst->role == WebKit::WebAXRoleProgressIndicator ||
+      dst->role == WebKit::WebAXRoleScrollBar ||
+      dst->role == WebKit::WebAXRoleSlider ||
+      dst->role == WebKit::WebAXRoleSpinButton) {
     dst->AddFloatAttribute(dst->ATTR_VALUE_FOR_RANGE, src.valueForRange());
     dst->AddFloatAttribute(dst->ATTR_MAX_VALUE_FOR_RANGE,
                            src.maxValueForRange());
@@ -550,8 +327,8 @@ void SerializeAccessibilityNode(
                            src.minValueForRange());
   }
 
-  if (dst->role == dst->ROLE_DOCUMENT ||
-      dst->role == dst->ROLE_WEB_AREA) {
+  if (dst->role == WebKit::WebAXRoleDocument ||
+      dst->role == WebKit::WebAXRoleWebArea) {
     dst->AddStringAttribute(dst->ATTR_HTML_TAG, "#document");
     const WebDocument& document = src.document();
     if (name.empty())
@@ -584,7 +361,7 @@ void SerializeAccessibilityNode(
     dst->AddIntAttribute(dst->ATTR_SCROLL_Y_MAX, max_offset.height());
   }
 
-  if (dst->role == dst->ROLE_TABLE) {
+  if (dst->role == WebKit::WebAXRoleTable) {
     int column_count = src.columnCount();
     int row_count = src.rowCount();
     if (column_count > 0 && row_count > 0) {
@@ -593,11 +370,11 @@ void SerializeAccessibilityNode(
       std::vector<int32> unique_cell_ids;
       dst->AddIntAttribute(dst->ATTR_TABLE_COLUMN_COUNT, column_count);
       dst->AddIntAttribute(dst->ATTR_TABLE_ROW_COUNT, row_count);
-      WebAccessibilityObject header = src.headerContainerObject();
+      WebAXObject header = src.headerContainerObject();
       if (!header.isDetached())
         dst->AddIntAttribute(dst->ATTR_TABLE_HEADER_ID, header.axID());
       for (int i = 0; i < column_count * row_count; ++i) {
-        WebAccessibilityObject cell = src.cellForColumnAndRow(
+        WebAXObject cell = src.cellForColumnAndRow(
             i % column_count, i / column_count);
         int cell_id = -1;
         if (!cell.isDetached()) {
@@ -614,23 +391,23 @@ void SerializeAccessibilityNode(
     }
   }
 
-  if (dst->role == dst->ROLE_ROW) {
+  if (dst->role == WebKit::WebAXRoleRow) {
     dst->AddIntAttribute(dst->ATTR_TABLE_ROW_INDEX, src.rowIndex());
-    WebAccessibilityObject header = src.rowHeader();
+    WebAXObject header = src.rowHeader();
     if (!header.isDetached())
       dst->AddIntAttribute(dst->ATTR_TABLE_ROW_HEADER_ID, header.axID());
   }
 
-  if (dst->role == dst->ROLE_COLUMN) {
+  if (dst->role == WebKit::WebAXRoleColumn) {
     dst->AddIntAttribute(dst->ATTR_TABLE_COLUMN_INDEX, src.columnIndex());
-    WebAccessibilityObject header = src.columnHeader();
+    WebAXObject header = src.columnHeader();
     if (!header.isDetached())
       dst->AddIntAttribute(dst->ATTR_TABLE_COLUMN_HEADER_ID, header.axID());
   }
 
-  if (dst->role == dst->ROLE_CELL ||
-      dst->role == dst->ROLE_ROW_HEADER ||
-      dst->role == dst->ROLE_COLUMN_HEADER) {
+  if (dst->role == WebKit::WebAXRoleCell ||
+      dst->role == WebKit::WebAXRoleRowHeader ||
+      dst->role == WebKit::WebAXRoleColumnHeader) {
     dst->AddIntAttribute(dst->ATTR_TABLE_CELL_COLUMN_INDEX,
                          src.cellColumnIndex());
     dst->AddIntAttribute(dst->ATTR_TABLE_CELL_COLUMN_SPAN,
@@ -648,7 +425,7 @@ void SerializeAccessibilityNode(
   // as an indirect child.
   int child_count = src.childCount();
   for (int i = 0; i < child_count; ++i) {
-    WebAccessibilityObject child = src.childAt(i);
+    WebAXObject child = src.childAt(i);
     std::vector<int32> indirect_child_ids;
     if (!is_iframe && !child.isDetached() && !IsParentUnignoredOf(src, child))
       indirect_child_ids.push_back(child.axID());
@@ -660,16 +437,16 @@ void SerializeAccessibilityNode(
 }
 
 bool ShouldIncludeChildNode(
-    const WebAccessibilityObject& parent,
-    const WebAccessibilityObject& child) {
-  switch(parent.roleValue()) {
-  case WebKit::WebAccessibilityRoleSlider:
-  case WebKit::WebAccessibilityRoleEditableText:
-  case WebKit::WebAccessibilityRoleTextArea:
-  case WebKit::WebAccessibilityRoleTextField:
-    return false;
-  default:
-    break;
+    const WebAXObject& parent,
+    const WebAXObject& child) {
+  switch(parent.role()) {
+    case WebKit::WebAXRoleSlider:
+    case WebKit::WebAXRoleEditableText:
+    case WebKit::WebAXRoleTextArea:
+    case WebKit::WebAXRoleTextField:
+      return false;
+    default:
+      break;
   }
 
   // The child may be invalid due to issues in webkit accessibility code.