Bug 673689 Introduced name space role. r=tbsaunde

accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -38,10 +38,11 @@
 
 #include "nsHTMLFormControlAccessible.h"
 
-#include "Relation.h"
-#include "States.h"
 #include "nsAccUtils.h"
 #include "nsTextEquivUtils.h"
+#include "Relation.h"
+#include "Role.h"
+#include "States.h"
 
 #include "nsIAccessibleRelation.h"
 #include "nsIDOMDocument.h"
@@ -72,10 +73,10 @@ nsHTMLCheckboxAccessible::
 {
 }
 
-PRUint32
+role
 nsHTMLCheckboxAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_CHECKBUTTON;
+  return roles::CHECKBUTTON;
 }
 
 PRUint8
@@ -303,10 +304,10 @@ nsHTMLButtonAccessible::NativeState()
   return state;
 }
 
-PRUint32
+role
 nsHTMLButtonAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_PUSHBUTTON;
+  return roles::PUSHBUTTON;
 }
 
 nsresult
@@ -387,10 +388,10 @@ nsHTML4ButtonAccessible::DoAction(PRUint8 aIndex)
   return NS_OK;
 }
 
-PRUint32
+role
 nsHTML4ButtonAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_PUSHBUTTON;
+  return roles::PUSHBUTTON;
 }
 
 PRUint64
@@ -429,14 +430,15 @@ nsHTMLTextFieldAccessible::
 
 NS_IMPL_ISUPPORTS_INHERITED3(nsHTMLTextFieldAccessible, nsAccessible, nsHyperTextAccessible, nsIAccessibleText, nsIAccessibleEditableText)
 
-PRUint32
+role
 nsHTMLTextFieldAccessible::NativeRole()
 {
   if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
                             nsGkAtoms::password, eIgnoreCase)) {
-    return nsIAccessibleRole::ROLE_PASSWORD_TEXT;
+    return roles::PASSWORD_TEXT;
   }
-  return nsIAccessibleRole::ROLE_ENTRY;
+  
+  return roles::ENTRY;
 }
 
 nsresult
@@ -644,8 +646,7 @@ nsHTMLTextFieldAccessible::IsWidget() const
 nsAccessible*
 nsHTMLTextFieldAccessible::ContainerWidget() const
 {
-  return mParent && mParent->Role() == nsIAccessibleRole::ROLE_AUTOCOMPLETE ?
-    mParent : nsnull;
+  return mParent && mParent->Role() == roles::AUTOCOMPLETE ? mParent : nsnull;
 }
 
 
@@ -660,12 +661,12 @@ nsHTMLFileInputAccessible(nsIContent* aContent, nsIWeakReference* aShell) :
   mFlags |= eHTMLFileInputAccessible;
 }
 
-PRUint32
+role
 nsHTMLFileInputAccessible::NativeRole()
 {
   // JAWS wants a text container, others don't mind. No specific role in
   // AT APIs.
-  return nsIAccessibleRole::ROLE_TEXT_CONTAINER;
+  return roles::TEXT_CONTAINER;
 }
 
 nsresult
@@ -684,7 +685,7 @@ nsHTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
        event->GetState() == states::HASPOPUP ||
        event->GetState() == states::INVALID)) {
     nsAccessible* input = GetChildAt(0);
-    if (input && input->Role() == nsIAccessibleRole::ROLE_ENTRY) {
+    if (input && input->Role() == roles::ENTRY) {
       nsRefPtr<AccStateChangeEvent> childEvent =
         new AccStateChangeEvent(input, event->GetState(),
                                 event->IsStateEnabled(),
@@ -693,7 +694,7 @@ nsHTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
     }
 
     nsAccessible* button = GetChildAt(1);
-    if (button && button->Role() == nsIAccessibleRole::ROLE_PUSHBUTTON) {
+    if (button && button->Role() == roles::PUSHBUTTON) {
       nsRefPtr<AccStateChangeEvent> childEvent =
         new AccStateChangeEvent(button, event->GetState(),
                                 event->IsStateEnabled(),
@@ -714,10 +715,10 @@ nsHTMLGroupboxAccessible::
 {
 }
 
-PRUint32
+role
 nsHTMLGroupboxAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_GROUPING;
+  return roles::GROUPING;
 }
 
 nsIContent*
@@ -782,16 +783,16 @@ nsHTMLLegendAccessible::RelationByType(PRUint32 aType)
     return rel;
 
   nsAccessible* groupbox = Parent();
-  if (groupbox && groupbox->Role() == nsIAccessibleRole::ROLE_GROUPING)
+  if (groupbox && groupbox->Role() == roles::GROUPING)
     rel.AppendTarget(groupbox);
 
   return rel;
 }
 
-PRUint32
+role
 nsHTMLLegendAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_LABEL;
+  return roles::LABEL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -816,10 +817,10 @@ nsHTMLFigureAccessible::GetAttributesInternal(nsIPersistentProperties* aAttribut
   return NS_OK;
 }
 
-PRUint32
+role
 nsHTMLFigureAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_FIGURE;
+  return roles::FIGURE;
 }
 
 nsresult
@@ -874,10 +875,10 @@ nsHTMLFigcaptionAccessible::
 {
 }
 
-PRUint32
+role
 nsHTMLFigcaptionAccessible::NativeRole()
 {
-  return nsIAccessibleRole::ROLE_CAPTION;
+  return roles::CAPTION;
 }
 
 Relation