Merge autoland to mozilla-central. a=merge

Author: Sandor Molnar

Cargo.lock

@@ -1158,7 +1158,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
   },
   { // searchbox
     nsGkAtoms::searchbox,
-    roles::ENTRY,
+    roles::SEARCHBOX,
     kUseMapRole,
     eNoValue,
     eActivateAction,

accessible/base/ARIAMap.cpp

@@ -660,7 +660,7 @@ ROLE(PASSWORD_TEXT,
      nullptr,
      ATK_ROLE_PASSWORD_TEXT,
      NSAccessibilityTextFieldRole,
-     NSAccessibilityUnknownSubrole,
+     NSAccessibilitySecureTextFieldSubrole,
      ROLE_SYSTEM_TEXT,
      ROLE_SYSTEM_TEXT,
      java::SessionAccessibility::CLASSNAME_EDITTEXT,
@@ -1844,4 +1844,17 @@ ROLE(ROWGROUP,
      IsAccessibilityElementRule::IfChildlessWithNameAndFocusable,
      UIA_GroupControlTypeId,
      eNameFromSubtreeIfReqRule)
+
+ROLE(SEARCHBOX,
+     "searchbox",
+     nsGkAtoms::searchbox,
+     ATK_ROLE_ENTRY,
+     NSAccessibilityTextFieldRole,
+     @"AXSearchField",
+     ROLE_SYSTEM_TEXT,
+     ROLE_SYSTEM_TEXT,
+     java::SessionAccessibility::CLASSNAME_EDITTEXT,
+     IsAccessibilityElementRule::Yes,
+     UIA_EditControlTypeId,
+     eNameFromValueRule)
 // clang-format on

accessible/base/RoleMap.h

@@ -451,16 +451,6 @@ already_AddRefed<nsIURI> Accessible::AnchorURIAt(uint32_t aAnchorIndex) const {
   return nullptr;
 }
 
-bool Accessible::IsSearchbox() const {
-  const nsRoleMapEntry* roleMapEntry = ARIARoleMap();
-  if (roleMapEntry && roleMapEntry->Is(nsGkAtoms::searchbox)) {
-    return true;
-  }
-
-  RefPtr<nsAtom> inputType = InputType();
-  return inputType == nsGkAtoms::search;
-}
-
 #ifdef A11Y_LOG
 void Accessible::DebugDescription(nsCString& aDesc) const {
   aDesc.Truncate();
@@ -632,9 +622,6 @@ nsStaticAtom* Accessible::ComputedARIARole() const {
     // map to a unique Gecko role.
     return roleMap->roleAtom;
   }
-  if (IsSearchbox()) {
-    return nsGkAtoms::searchbox;
-  }
   role geckoRole = Role();
   if (geckoRole == roles::LANDMARK) {
     // Landmark role from native markup; e.g. <main>, <nav>.

accessible/basetypes/Accessible.cpp

@@ -442,11 +442,6 @@ class Accessible {
    */
   virtual nsAtom* TagName() const = 0;
 
-  /**
-   * Return input `type` attribute
-   */
-  virtual already_AddRefed<nsAtom> InputType() const = 0;
-
   /**
    * Return a landmark role if applied.
    */
@@ -646,8 +641,6 @@ class Accessible {
 
   bool IsDateTimeField() const { return mType == eHTMLDateTimeFieldType; }
 
-  bool IsSearchbox() const;
-
   virtual bool HasNumericValue() const = 0;
 
   /**

accessible/basetypes/Accessible.h

@@ -4304,20 +4304,6 @@ nsAtom* LocalAccessible::TagName() const {
                                            : nullptr;
 }
 
-already_AddRefed<nsAtom> LocalAccessible::InputType() const {
-  if (!IsTextField() && !IsDateTimeField()) {
-    return nullptr;
-  }
-
-  dom::Element* el = mContent->AsElement();
-  if (const nsAttrValue* attr = el->GetParsedAttr(nsGkAtoms::type)) {
-    RefPtr<nsAtom> inputType = attr->GetAsAtom();
-    return inputType.forget();
-  }
-
-  return nullptr;
-}
-
 already_AddRefed<nsAtom> LocalAccessible::DisplayStyle() const {
   dom::Element* elm = Elm();
   if (!elm) {

accessible/generic/LocalAccessible.cpp

@@ -733,8 +733,6 @@ class LocalAccessible : public nsISupports, public Accessible {
 
   virtual nsAtom* TagName() const override;
 
-  virtual already_AddRefed<nsAtom> InputType() const override;
-
   virtual already_AddRefed<nsAtom> DisplayStyle() const override;
 
   virtual float Opacity() const override;

accessible/generic/LocalAccessible.h

@@ -289,9 +289,16 @@ role HTMLTextFieldAccessible::NativeRole() const {
   if (mType == eHTMLTextPasswordFieldType) {
     return roles::PASSWORD_TEXT;
   }
-  if (mContent->AsElement()->HasAttr(nsGkAtoms::list_)) {
+  dom::Element* el = mContent->AsElement();
+  if (el->HasAttr(nsGkAtoms::list_)) {
     return roles::EDITCOMBOBOX;
   }
+  if (const nsAttrValue* attr = el->GetParsedAttr(nsGkAtoms::type)) {
+    RefPtr<nsAtom> inputType = attr->GetAsAtom();
+    if (inputType == nsGkAtoms::search) {
+      return roles::SEARCHBOX;
+    }
+  }
   return roles::ENTRY;
 }
 

accessible/html/HTMLFormControlAccessible.cpp

@@ -813,4 +813,9 @@ interface nsIAccessibleRole : nsISupports
    * elements in an HTML table element.
    */
   const unsigned long ROLE_ROWGROUP = 139;
+
+  /**
+   * A type of textbox intended for specifying search criteria.
+   */
+  const unsigned long ROLE_SEARCHBOX = 140;
 };

accessible/interfaces/nsIAccessibleRole.idl

@@ -374,6 +374,9 @@ static uint64_t GetAccessibilityTraits(Accessible* aAccessible) {
     case roles::PASSWORD_TEXT:
       traits |= Trait::SecureTextField;
       break;
+    case roles::SEARCHBOX:
+      traits |= Trait::SearchField;
+      break;
     default:
       break;
   }
@@ -405,10 +408,6 @@ static uint64_t GetAccessibilityTraits(Accessible* aAccessible) {
       traits |= Trait::IsEditing | Trait::TextOperationsAvailable;
     }
 
-    if (aAccessible->IsSearchbox()) {
-      traits |= Trait::SearchField;
-    }
-
     if (state & states::MULTI_LINE) {
       traits |= Trait::TextArea;
     }