Generate ax enums from idl.

This cl lays the groundwork for sharing all ax enums between platfrom accessibility and extension accessibility.

BUG=

Review URL: https://codereview.chromium.org/143473003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249993 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 27 insertions, 26 deletions

diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc
index 452f01b..0e79a04 100644
--- a/content/browser/accessibility/browser_accessibility.cc
+++ b/content/browser/accessibility/browser_accessibility.cc
@@ -259,6 +259,7 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsForRange(int start, int len)
 
     gfx::Rect child_overlap_rect;
     switch (text_direction) {
+      case ui::AX_TEXT_DIRECTION_NONE:
       case ui::AX_TEXT_DIRECTION_LR: {
         int left = child_rect.x() + start_pixel_offset;
         int right = child_rect.x() + end_pixel_offset;
@@ -602,7 +603,7 @@ bool BrowserAccessibility::IsEditableText() const {
   // Note: WebAXStateReadonly being false means it's either a text control,
   // or contenteditable. We also check for editable text roles to cover
   // another element that has role=textbox set on it.
-  return (!HasState(ui::AX_STATE_READONLY) ||
+  return (!HasState(ui::AX_STATE_READ_ONLY) ||
           role_ == ui::AX_ROLE_TEXT_FIELD ||
           role_ == ui::AX_ROLE_TEXT_AREA);
 }
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 9e3e771..cfc924b 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -95,7 +95,7 @@ RoleMap BuildRoleMap() {
     { ui::AX_ROLE_IMAGE_MAP, NSAccessibilityGroupRole },
     { ui::AX_ROLE_IMAGE_MAP_LINK, NSAccessibilityLinkRole },
     { ui::AX_ROLE_INCREMENTOR, NSAccessibilityIncrementorRole },
-    { ui::AX_ROLE_LABEL, NSAccessibilityGroupRole },
+    { ui::AX_ROLE_LABEL_TEXT, NSAccessibilityGroupRole },
     { ui::AX_ROLE_LINK, NSAccessibilityLinkRole },
     { ui::AX_ROLE_LIST, NSAccessibilityListRole },
     { ui::AX_ROLE_LIST_BOX, NSAccessibilityListRole },
diff --git a/content/browser/accessibility/browser_accessibility_manager_android.cc b/content/browser/accessibility/browser_accessibility_manager_android.cc
index d928258..7cae154 100644
--- a/content/browser/accessibility/browser_accessibility_manager_android.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_android.cc
@@ -77,7 +77,7 @@ ui::AXNodeData BrowserAccessibilityManagerAndroid::GetEmptyDocument() {
   ui::AXNodeData empty_document;
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  empty_document.state = 1 << ui::AX_STATE_READONLY;
+  empty_document.state = 1 << ui::AX_STATE_READ_ONLY;
   return empty_document;
 }
 
diff --git a/content/browser/accessibility/browser_accessibility_manager_gtk.cc b/content/browser/accessibility/browser_accessibility_manager_gtk.cc
index 975336f..3d7a976 100644
--- a/content/browser/accessibility/browser_accessibility_manager_gtk.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_gtk.cc
@@ -40,7 +40,7 @@ ui::AXNodeData BrowserAccessibilityManagerGtk::GetEmptyDocument() {
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
   empty_document.state =
-      1 << ui::AX_STATE_READONLY;
+      1 << ui::AX_STATE_READ_ONLY;
   return empty_document;
 }
 
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 801dca8..834799c 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -33,7 +33,7 @@ ui::AXNodeData BrowserAccessibilityManagerMac::GetEmptyDocument() {
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
   empty_document.state =
-      1 << ui::AX_STATE_READONLY;
+      1 << ui::AX_STATE_READ_ONLY;
   return empty_document;
 }
 
diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
index f06f1a9..36e5d23 100644
--- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
@@ -640,7 +640,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
   inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text1.location = gfx::Rect(100, 100, 29, 9);
   inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
-                               blink::WebAXTextDirectionLR);
+                               ui::AX_TEXT_DIRECTION_LR);
   std::vector<int32> character_offsets1;
   character_offsets1.push_back(6);   // 0
   character_offsets1.push_back(11);  // 1
@@ -659,7 +659,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
   inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text2.location = gfx::Rect(100, 109, 28, 9);
   inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
-                               blink::WebAXTextDirectionLR);
+                               ui::AX_TEXT_DIRECTION_LR);
   std::vector<int32> character_offsets2;
   character_offsets2.push_back(5);
   character_offsets2.push_back(10);
@@ -736,7 +736,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
   inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text1.location = gfx::Rect(100, 100, 30, 20);
   inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
-                               blink::WebAXTextDirectionLR);
+                               ui::AX_TEXT_DIRECTION_LR);
   std::vector<int32> character_offsets1;
   character_offsets1.push_back(10);  // 0
   character_offsets1.push_back(20);  // 1
@@ -751,7 +751,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
   inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text2.location = gfx::Rect(130, 100, 30, 20);
   inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
-                               blink::WebAXTextDirectionRL);
+                               ui::AX_TEXT_DIRECTION_RL);
   std::vector<int32> character_offsets2;
   character_offsets2.push_back(10);
   character_offsets2.push_back(20);
@@ -837,7 +837,7 @@ TEST(BrowserAccessibilityManagerTest, MAYBE_BoundsForRangeOnParentElement) {
   inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text1.location = gfx::Rect(100, 100, 40, 20);
   inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
-                               blink::WebAXTextDirectionLR);
+                               ui::AX_TEXT_DIRECTION_LR);
   std::vector<int32> character_offsets1;
   character_offsets1.push_back(20);  // 0
   character_offsets1.push_back(40);  // 1
@@ -850,7 +850,7 @@ TEST(BrowserAccessibilityManagerTest, MAYBE_BoundsForRangeOnParentElement) {
   inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text2.location = gfx::Rect(160, 100, 40, 20);
   inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
-                               blink::WebAXTextDirectionLR);
+                               ui::AX_TEXT_DIRECTION_LR);
   std::vector<int32> character_offsets2;
   character_offsets2.push_back(20);  // 0
   character_offsets2.push_back(40);  // 1
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/content/browser/accessibility/browser_accessibility_manager_win.cc
index 81ea9dc..684e11b 100644
--- a/content/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -59,7 +59,7 @@ ui::AXNodeData BrowserAccessibilityManagerWin::GetEmptyDocument() {
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
   empty_document.state =
       (1 << blink::WebAXStateEnabled) |
-      (1 << ui::AX_STATE_READONLY) |
+      (1 << ui::AX_STATE_READ_ONLY) |
       (1 << ui::AX_STATE_BUSY);
   return empty_document;
 }
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 451043b..1684450 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3357,7 +3357,7 @@ void BrowserAccessibilityWin::InitRoleAndState() {
   // WebKit marks everything as readonly unless it's editable text, so if it's
   // not readonly, mark it as editable now. The final computation of the
   // READONLY state for MSAA is below, after the switch.
-  if (!HasState(ui::AX_STATE_READONLY))
+  if (!HasState(ui::AX_STATE_READ_ONLY))
     ia2_state_ |= IA2_STATE_EDITABLE;
 
   base::string16 invalid;
@@ -3526,7 +3526,7 @@ void BrowserAccessibilityWin::InitRoleAndState() {
       ia_state_ |= STATE_SYSTEM_LINKED;
       ia_state_ |= STATE_SYSTEM_READONLY;
       break;
-    case ui::AX_ROLE_LABEL:
+    case ui::AX_ROLE_LABEL_TEXT:
       ia_role_ = ROLE_SYSTEM_TEXT;
       ia2_role_ = IA2_ROLE_LABEL;
       break;
@@ -3778,7 +3778,7 @@ void BrowserAccessibilityWin::InitRoleAndState() {
       ia_role_ != ROLE_SYSTEM_DOCUMENT) {
     ia_state_ &= ~(STATE_SYSTEM_READONLY);
   }
-  if (!HasState(ui::AX_STATE_READONLY))
+  if (!HasState(ui::AX_STATE_READ_ONLY))
     ia_state_ &= ~(STATE_SYSTEM_READONLY);
   if (GetBoolAttribute(ui::AX_ATTR_ARIA_READONLY))
     ia_state_ |= STATE_SYSTEM_READONLY;
diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc
index 8f97483..fad5ad4 100644
--- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
@@ -423,19 +423,19 @@ TEST_F(BrowserAccessibilityTest, TestSimpleHypertext) {
   ui::AXNodeData text1;
   text1.id = 11;
   text1.role = ui::AX_ROLE_STATIC_TEXT;
-  text1.state = 1 << ui::AX_STATE_READONLY;
+  text1.state = 1 << ui::AX_STATE_READ_ONLY;
   text1.SetName(text1_name);
 
   ui::AXNodeData text2;
   text2.id = 12;
   text2.role = ui::AX_ROLE_STATIC_TEXT;
-  text2.state = 1 << ui::AX_STATE_READONLY;
+  text2.state = 1 << ui::AX_STATE_READ_ONLY;
   text2.SetName(text2_name);
 
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root.state = 1 << ui::AX_STATE_READONLY;
+  root.state = 1 << ui::AX_STATE_READ_ONLY;
   root.child_ids.push_back(11);
   root.child_ids.push_back(12);
 
@@ -491,13 +491,13 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
   ui::AXNodeData text1;
   text1.id = 11;
   text1.role = ui::AX_ROLE_STATIC_TEXT;
-  text1.state = 1 << ui::AX_STATE_READONLY;
+  text1.state = 1 << ui::AX_STATE_READ_ONLY;
   text1.SetName(text1_name);
 
   ui::AXNodeData text2;
   text2.id = 12;
   text2.role = ui::AX_ROLE_STATIC_TEXT;
-  text2.state = 1 << ui::AX_STATE_READONLY;
+  text2.state = 1 << ui::AX_STATE_READ_ONLY;
   text2.SetName(text2_name);
 
   ui::AXNodeData button1, button1_text;
@@ -506,8 +506,8 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
   button1_text.SetName(button1_text_name);
   button1.role = ui::AX_ROLE_BUTTON;
   button1_text.role = ui::AX_ROLE_STATIC_TEXT;
-  button1.state = 1 << ui::AX_STATE_READONLY;
-  button1_text.state = 1 << ui::AX_STATE_READONLY;
+  button1.state = 1 << ui::AX_STATE_READ_ONLY;
+  button1_text.state = 1 << ui::AX_STATE_READ_ONLY;
   button1.child_ids.push_back(15);
 
   ui::AXNodeData link1, link1_text;
@@ -516,14 +516,14 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
   link1_text.SetName(link1_text_name);
   link1.role = ui::AX_ROLE_LINK;
   link1_text.role = ui::AX_ROLE_STATIC_TEXT;
-  link1.state = 1 << ui::AX_STATE_READONLY;
-  link1_text.state = 1 << ui::AX_STATE_READONLY;
+  link1.state = 1 << ui::AX_STATE_READ_ONLY;
+  link1_text.state = 1 << ui::AX_STATE_READ_ONLY;
   link1.child_ids.push_back(16);
 
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root.state = 1 << ui::AX_STATE_READONLY;
+  root.state = 1 << ui::AX_STATE_READ_ONLY;
   root.child_ids.push_back(11);
   root.child_ids.push_back(13);
   root.child_ids.push_back(12);
@@ -604,7 +604,7 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
   // set automatically.
   CountedBrowserAccessibility::reset();
   const int32 busy_state = 1 << ui::AX_STATE_BUSY;
-  const int32 readonly_state = 1 << ui::AX_STATE_READONLY;
+  const int32 readonly_state = 1 << ui::AX_STATE_READ_ONLY;
   const int32 enabled_state = 1 << blink::WebAXStateEnabled;
   scoped_ptr<content::LegacyRenderWidgetHostHWND> accessible_hwnd(
       content::LegacyRenderWidgetHostHWND::Create(GetDesktopWindow()));