Bug 1445968 Accessible: factorize and optimize testing for password role r=surkov

--HG--
extra : rebase_source : 5f945bab6c2c86d059893082f9f04d6ac4492f73

accessible/atk/nsMaiInterfaceText.cpp

@@ -130,7 +130,7 @@ static void
 ConvertTexttoAsterisks(AccessibleWrap* accWrap, nsAString& aString)
 {
   // convert each char to "*" when it's "password text"
-  if (accWrap->NativeRole() == roles::PASSWORD_TEXT) {
+  if (accWrap->IsPassword()) {
     DOMtoATK::ConvertTexttoAsterisks(aString);
   }
 }
@@ -148,7 +148,7 @@ getTextCB(AtkText *aText, gint aStartOffset, gint aEndOffset)
       return nullptr;
 
     return DOMtoATK::NewATKString(text, aStartOffset, aEndOffset,
-         accWrap->NativeRole() == roles::PASSWORD_TEXT ?
+         accWrap->IsPassword() ?
            DOMtoATK::AtkStringConvertFlags::ConvertTextToAsterisks :
            DOMtoATK::AtkStringConvertFlags::None);
 

accessible/base/AccTypes.h

@@ -39,6 +39,7 @@ enum AccType {
   eHTMLTableCellType,
   eHTMLTableRowType,
   eHTMLTextFieldType,
+  eHTMLTextPasswordFieldType,
   eHyperTextType,
   eImageType,
   eOuterDocType,

accessible/generic/Accessible.h

@@ -649,7 +649,10 @@ public:
 
   bool IsTableRow() const { return HasGenericType(eTableRow); }
 
-  bool IsTextField() const { return mType == eHTMLTextFieldType; }
+  bool IsTextField() const { return mType == eHTMLTextFieldType ||
+                                    mType == eHTMLTextPasswordFieldType; }
+
+  bool IsPassword() const { return mType == eHTMLTextPasswordFieldType; }
 
   bool IsText() const { return mGenericTypes & eText; }
 

accessible/html/HTMLFormControlAccessible.cpp

@@ -282,14 +282,16 @@ HTMLTextFieldAccessible::
   HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   HyperTextAccessibleWrap(aContent, aDoc)
 {
-  mType = eHTMLTextFieldType;
+  mType = mContent->AsElement()->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
+                            nsGkAtoms::password, eIgnoreCase) ?
+            eHTMLTextPasswordFieldType :
+            eHTMLTextFieldType;
 }
 
 role
 HTMLTextFieldAccessible::NativeRole()
 {
-  if (mContent->AsElement()->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
+  if (mType == eHTMLTextPasswordFieldType) {
-                                         nsGkAtoms::password, eIgnoreCase)) {
     return roles::PASSWORD_TEXT;
   }
 

accessible/tests/mochitest/treeupdate/test_recreation.html

@@ -87,6 +87,14 @@
       this.__proto__ = new changeAttr(aID, "aria-multiselectable", "true");
     }
 
+    function changeTypeToPassword(aID) {
+      this.__proto__ = new changeAttr(aID, "type", "password");
+    }
+
+    function changeTypeToText(aID) {
+      this.__proto__ = new changeAttr(aID, "type", "text");
+    }
+
     // //////////////////////////////////////////////////////////////////////////
     // Test
 
@@ -113,6 +121,10 @@
       // recreate an accessible by aria-multiselectable change
       gQueue.push(new changeMultiselectable("div3"));
 
+      // recreate an accessible by type
+      gQueue.push(new changeTypeToText("password"));
+      gQueue.push(new changeTypeToPassword("text"));
+
       gQueue.invoke(); // SimpleTest.finish() will be called in the end
     }
 
@@ -139,5 +151,8 @@
   <div id="div3" role="listbox">list</div>
 
   <div id="eventdump"></div>
+
+  <form><input type="password" id="password"/></form>
+  <form><input type="text" id="text"/></form>
 </body>
 </html>