Merge r180621 - AX: Implement support for ARIA 1.1 'searchbox' role

https://bugs.webkit.org/show_bug.cgi?id=142004 Reviewed by Chris Fleizach. Source/WebCore: Add a new accessible SearchFieldRole to handle both the ARIA role and the "search" input type. No new tests. Instead, added a new test case to roles-exposed.html for the mapping, and updated roles-computedRoleString.html because there is now a one-to-one mapping between the "search" input type and an ARIA role. * accessibility/AccessibilityNodeObject.cpp: (WebCore::AccessibilityNodeObject::determineAccessibilityRole): (WebCore::AccessibilityNodeObject::isSearchField): * accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::isARIATextControl): (WebCore::AccessibilityObject::isARIAInput): (WebCore::initializeRoleMap): * accessibility/AccessibilityObject.h: * accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::determineAccessibilityRole): * accessibility/atk/WebKitAccessibleWrapperAtk.cpp: (atkRole): * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]): (-[WebAccessibilityObjectWrapper accessibilityTraits]): (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]): * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: (createAccessibilityRoleMap): LayoutTests: * accessibility/roles-computedRoleString-expected.txt: Updated for new role. * accessibility/roles-computedRoleString.html: Updated for new role. * accessibility/roles-exposed.html: New test case added. * platform/efl/accessibility/roles-exposed-expected.txt: Updated for new test case. * platform/gtk/accessibility/roles-exposed-expected.txt: Updated for new test case. * platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated for new test case. * platform/mac/accessibility/roles-exposed-expected.txt: Updated for new test case.
WebKit · Mar 1, 2015 · ff58dcf · ff58dcf
1 parent 0cb32b9
commit ff58dcf
Show file tree

Hide file tree

Showing 16 changed files with 86 additions and 9 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2015-02-25  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: Implement support for ARIA 1.1 'searchbox' role
+        https://bugs.webkit.org/show_bug.cgi?id=142004
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/roles-computedRoleString-expected.txt: Updated for new role.
+        * accessibility/roles-computedRoleString.html: Updated for new role.
+        * accessibility/roles-exposed.html: New test case added.
+        * platform/efl/accessibility/roles-exposed-expected.txt: Updated for new test case.
+        * platform/gtk/accessibility/roles-exposed-expected.txt: Updated for new test case.
+        * platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated for new test case.
+        * platform/mac/accessibility/roles-exposed-expected.txt: Updated for new test case.
+
 2015-02-24  Joanmarie Diggs  <jdiggs@igalia.com>
 
         AX: Implement support for ARIA 1.1 'switch' role

diff --git a/LayoutTests/accessibility/roles-computedRoleString-expected.txt b/LayoutTests/accessibility/roles-computedRoleString-expected.txt
@@ -35,7 +35,7 @@ PASS: input[type='password'] -> .
 PASS: input[type='radio'] -> radio. 
 PASS: input[type='range'] -> slider. 
 PASS: input[type='reset'] -> button. 
-PASS: input[type='search'] -> . 
+PASS: input[type='search'] -> searchbox. 
 PASS: input[type='submit'] -> button. 
 PASS: input[type='tel'] -> . 
 PASS: input[type='text'] -> . 

diff --git a/LayoutTests/accessibility/roles-computedRoleString.html b/LayoutTests/accessibility/roles-computedRoleString.html
@@ -45,7 +45,7 @@ <h5 data-role="heading" class="ex">X</h6>
 <input type="radio" data-role="radio" class="ex" data-note="[type='radio']">
 <input type="range" data-role="slider" class="ex" data-note="[type='range']">
 <input type="reset" data-role="button" class="ex" data-note="[type='reset']">
-<input type="search" value="X" data-role="" class="ex" data-note="[type='search']">
+<input type="search" value="X" data-role="searchbox" class="ex" data-note="[type='search']">
 <input type="submit" data-role="button" class="ex" data-note="[type='submit']">
 <input type="tel" value="X" data-role="" class="ex" data-note="[type='tel']">
 <input type="text" value="X" data-role="" class="ex" data-note="[type='text']">

diff --git a/LayoutTests/accessibility/roles-exposed.html b/LayoutTests/accessibility/roles-exposed.html
@@ -300,6 +300,7 @@ <h6 data-platform="atk,mac" class="ex">X</h6>
 <div role="region" data-platform="atk,mac" class="ex">X</div>
 <div role="scrollbar"                data-platform="atk,mac" class="ex">X</div>
 <div role="search"                   data-platform="atk,mac" class="ex">X</div>
+<div role="searchbox"                data-platform="atk,mac" class="ex">X</div>
 <div role="separator"                data-platform="atk,mac" class="ex">X</div>
 <div role="slider"                   data-platform="atk,mac" class="ex">X</div>
 <div role="spinbutton"               data-platform="atk,mac" class="ex">X</div>

diff --git a/LayoutTests/platform/efl/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/efl/accessibility/roles-exposed-expected.txt
@@ -631,6 +631,9 @@ div[role=scrollbar]
 div[role=search]
       AXRole: AXLandmarkSearch
 
+div[role=searchbox]
+      AXRole: AXTextField
+
 div[role=separator]
       AXRole: AXSeparator
 

diff --git a/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt
@@ -631,6 +631,9 @@ div[role=scrollbar]
 div[role=search]
       AXRole: AXLandmarkSearch
 
+div[role=searchbox]
+      AXRole: AXTextField
+
 div[role=separator]
       AXRole: AXSeparator
 

diff --git a/LayoutTests/platform/mac-mavericks/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/mac-mavericks/accessibility/roles-exposed-expected.txt
@@ -1049,6 +1049,11 @@ div[role=search]
       AXSubrole: AXLandmarkSearch
       AXRoleDescription: search
 
+div[role=searchbox]
+      AXRole: AXTextField
+      AXSubrole: AXSearchField
+      AXRoleDescription: search text field
+
 div[role=separator]
       AXRole: AXSplitter
       AXSubrole: 

diff --git a/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt
@@ -1049,6 +1049,11 @@ div[role=search]
       AXSubrole: AXLandmarkSearch
       AXRoleDescription: search
 
+div[role=searchbox]
+      AXRole: AXTextField
+      AXSubrole: AXSearchField
+      AXRoleDescription: search text field
+
 div[role=separator]
       AXRole: AXSplitter
       AXSubrole: 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,37 @@
+2015-02-25  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: Implement support for ARIA 1.1 'searchbox' role
+        https://bugs.webkit.org/show_bug.cgi?id=142004
+
+        Reviewed by Chris Fleizach.
+
+        Add a new accessible SearchFieldRole to handle both the ARIA role
+        and the "search" input type.
+
+        No new tests. Instead, added a new test case to roles-exposed.html
+        for the mapping, and updated roles-computedRoleString.html because
+        there is now a one-to-one mapping between the "search" input type
+        and an ARIA role.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::determineAccessibilityRole):
+        (WebCore::AccessibilityNodeObject::isSearchField):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::isARIATextControl):
+        (WebCore::AccessibilityObject::isARIAInput):
+        (WebCore::initializeRoleMap):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (atkRole):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+        (-[WebAccessibilityObjectWrapper accessibilityTraits]):
+        (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (createAccessibilityRoleMap):
+
 2015-02-24  Joanmarie Diggs  <jdiggs@igalia.com>
 
         AX: Implement support for ARIA 1.1 'switch' role

diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
@@ -302,6 +302,8 @@ AccessibilityRole AccessibilityNodeObject::determineAccessibilityRole()
             return SliderRole;
         if (input.isInputTypeHidden())
             return IgnoredRole;
+        if (input.isSearchField())
+            return SearchFieldRole;
 
 #if ENABLE(INPUT_TYPE_COLOR)
         const AtomicString& type = input.getAttribute(typeAttr);
@@ -485,13 +487,13 @@ bool AccessibilityNodeObject::isSearchField() const
     if (!node)
         return false;
 
+    if (roleValue() == SearchFieldRole)
+        return true;
+
     HTMLInputElement* inputElement = node->toInputElement();
     if (!inputElement)
         return false;
 
-    if (inputElement->isSearchField())
-        return true;
-
     // Some websites don't label their search fields as such. However, they will
     // use the word "search" in either the form or input type. This won't catch every case,
     // but it will catch google.com for example.

diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -386,7 +386,7 @@ bool AccessibilityObject::isTextControl() const
 
 bool AccessibilityObject::isARIATextControl() const
 {
-    return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole;
+    return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchFieldRole;
 }
 
 bool AccessibilityObject::isLandmark() const
@@ -779,7 +779,7 @@ bool AccessibilityObject::hasAttributesRequiredForInclusion() const
 
 bool AccessibilityObject::isARIAInput(AccessibilityRole ariaRole)
 {
-    return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole || ariaRole == SwitchRole;
+    return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole || ariaRole == SwitchRole || ariaRole == SearchFieldRole;
 }    
 
 bool AccessibilityObject::isARIAControl(AccessibilityRole ariaRole)
@@ -1912,6 +1912,7 @@ static void initializeRoleMap()
         { "row", RowRole },
         { "scrollbar", ScrollBarRole },
         { "search", LandmarkSearchRole },
+        { "searchbox", SearchFieldRole },
         { "separator", SplitterRole },
         { "slider", SliderRole },
         { "spinbutton", SpinButtonRole },

diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
@@ -180,6 +180,7 @@ enum AccessibilityRole {
     RulerMarkerRole,
     ScrollAreaRole,
     ScrollBarRole,
+    SearchFieldRole,
     SheetRole,
     SliderRole,
     SliderThumbRole,

diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2484,8 +2484,10 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
     if (cssBox && cssBox->isRenderView())
         return WebAreaRole;
 
-    if (cssBox && cssBox->isTextField())
-        return TextFieldRole;
+    if (cssBox && cssBox->isTextField()) {
+        if (is<HTMLInputElement>(node))
+            return downcast<HTMLInputElement>(*node).isSearchField() ? SearchFieldRole : TextFieldRole;
+    }
 
     if (cssBox && cssBox->isTextArea())
         return TextAreaRole;

diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
@@ -524,6 +524,7 @@ static AtkRole atkRole(AccessibilityObject* coreObject)
         return ATK_ROLE_PAGE_TAB_LIST;
     case TextFieldRole:
     case TextAreaRole:
+    case SearchFieldRole:
         return ATK_ROLE_ENTRY;
     case StaticTextRole:
         return ATK_ROLE_TEXT;

diff --git a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
@@ -297,6 +297,7 @@ - (BOOL)accessibilityCanFuzzyHitTest
     case PopUpButtonRole:
     case RadioButtonRole:
     case ScrollBarRole:
+    case SearchFieldRole:
     case SliderRole:
     case StaticTextRole:
     case SwitchRole:
@@ -543,6 +544,7 @@ - (uint64_t)accessibilityTraits
             if (m_object->isPasswordField())
                 traits |= [self _axSecureTextFieldTrait];
             FALLTHROUGH;
+        case SearchFieldRole:
         case TextAreaRole:
             traits |= [self _axTextEntryTrait];
             if (m_object->isFocused())
@@ -648,6 +650,7 @@ - (BOOL)determineIsAccessibilityElement
         case DocumentMathRole:
         case HorizontalRuleRole:
         case SwitchRole:
+        case SearchFieldRole:
             return true;
         case StaticTextRole:
         {

diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
@@ -1944,6 +1944,7 @@ - (NSValue *)position
         { HorizontalRuleRole, NSAccessibilitySplitterRole },
         { BlockquoteRole, NSAccessibilityGroupRole },
         { SwitchRole, NSAccessibilityCheckBoxRole },
+        { SearchFieldRole, NSAccessibilityTextFieldRole },
     };
     AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;