Bug 1479036 - Android classes role additions. r=surkov

--HG--
extra : rebase_source : a3612efad26d164c33e7724079722c3163b5cf71

accessible/atk/AccessibleWrap.cpp

@@ -678,7 +678,7 @@ getRoleCB(AtkObject *aAtkObj)
 #endif
 
 #define ROLE(geckoRole, stringRole, atkRole, macRole, \
-             msaaRole, ia2Role, nameRule) \
+             msaaRole, ia2Role, androidClass, nameRule) \
   case roles::geckoRole: \
     aAtkObj->role = atkRole; \
     break;

accessible/base/Asserts.cpp

@@ -11,7 +11,7 @@
 
 using namespace mozilla::a11y;
 
-#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \
+#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, androidClass, nameRule) \
   static_assert(static_cast<uint32_t>(roles::geckoRole) \
                 == static_cast<uint32_t>(nsIAccessibleRole::ROLE_ ## geckoRole), \
                 "internal and xpcom roles differ!");

accessible/base/nsAccessibilityService.cpp

@@ -786,7 +786,7 @@ void
 nsAccessibilityService::GetStringRole(uint32_t aRole, nsAString& aString)
 {
 #define ROLE(geckoRole, stringRole, atkRole, \
-             macRole, msaaRole, ia2Role, nameRule) \
+             macRole, msaaRole, ia2Role, androidClass, nameRule) \
   case roles::geckoRole: \
     aString.AssignLiteral(stringRole); \
     return;

accessible/base/nsTextEquivUtils.cpp

@@ -352,7 +352,7 @@ uint32_t
 nsTextEquivUtils::GetRoleRule(role aRole)
 {
 #define ROLE(geckoRole, stringRole, atkRole, \
-             macRole, msaaRole, ia2Role, nameRule) \
+             macRole, msaaRole, ia2Role, androidClass, nameRule) \
   case roles::geckoRole: \
     return nameRule;
 

accessible/mac/mozAccessible.mm

@@ -713,7 +713,7 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
     return nil;
   }
 
-#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule) \
+#define ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, androidClass, nameRule) \
   case roles::geckoRole: \
     return macRole;
 

accessible/windows/ia2/ia2Accessible.cpp

@@ -168,7 +168,7 @@ ia2Accessible::role(long* aRole)
     return CO_E_OBJNOTCONNECTED;
 
 #define ROLE(_geckoRole, stringRole, atkRole, macRole, \
-             msaaRole, ia2Role, nameRule) \
+             msaaRole, ia2Role, androidClass, nameRule) \
   case roles::_geckoRole: \
     *aRole = ia2Role; \
     break;

accessible/windows/msaa/AccessibleWrap.cpp

@@ -476,7 +476,7 @@ AccessibleWrap::get_accRole(
   uint32_t msaaRole = 0;
 
 #define ROLE(_geckoRole, stringRole, atkRole, macRole, \
-             _msaaRole, ia2Role, nameRule) \
+             _msaaRole, ia2Role, androidClass, nameRule) \
   case roles::_geckoRole: \
     msaaRole = _msaaRole; \
     break;