Merge r221879 - AX: [ATK] aria-autocomplete not exposed on comboboxes

https://bugs.webkit.org/show_bug.cgi?id=176724

Reviewed by Chris Fleizach.

Source/WebCore:

Add a check to AccessibilityObject::supportsARIAAutoComplete() for
combobox because isARIATextControl() returns false for that role.

Add new combobox test cases to existing aria-autocomplete.html test.

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::supportsARIAAutoComplete const):

LayoutTests:

* accessibility/gtk/aria-autocomplete-expected.txt: Updated for new test cases
* accessibility/gtk/aria-autocomplete.html: New test cases for combobox added

LayoutTests/ChangeLog

@@ -1,3 +1,13 @@
+2017-09-11  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: [ATK] aria-autocomplete not exposed on comboboxes
+        https://bugs.webkit.org/show_bug.cgi?id=176724
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/gtk/aria-autocomplete-expected.txt: Updated for new test cases
+        * accessibility/gtk/aria-autocomplete.html: New test cases for combobox added
+
 2017-09-08  Dean Jackson  <dino@apple.com>
 
         gl.detachShader breaks shader program

LayoutTests/accessibility/gtk/aria-autocomplete-expected.txt

@@ -45,6 +45,27 @@ AXPlatformAttributes: computed-role:group, xml-roles:group, html-id:test13, tag:
 
 test14 supports autocompletion: false
 AXPlatformAttributes: computed-role:group, xml-roles:group, html-id:test14, tag:div, toolkit:WebKitGtk
+
+test15 supports autocompletion: false
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, html-id:test15, tag:div, toolkit:WebKitGtk
+
+test16 supports autocompletion: false
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, autocomplete:none, html-id:test16, tag:div, toolkit:WebKitGtk
+
+test17 supports autocompletion: false
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, autocomplete:none, html-id:test17, tag:div, toolkit:WebKitGtk
+
+test18 supports autocompletion: false
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, autocomplete:none, html-id:test18, tag:div, toolkit:WebKitGtk
+
+test19 supports autocompletion: true
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, autocomplete:both, html-id:test19, tag:div, toolkit:WebKitGtk
+
+test20 supports autocompletion: true
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, autocomplete:inline, html-id:test20, tag:div, toolkit:WebKitGtk
+
+test21 supports autocompletion: true
+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, haspopup:listbox, autocomplete:list, html-id:test21, tag:div, toolkit:WebKitGtk
 PASS successfullyParsed is true
 
 TEST COMPLETE

LayoutTests/accessibility/gtk/aria-autocomplete.html

@@ -19,6 +19,13 @@
   <div id="test12" role="group" aria-autocomplete="both">X</div>
   <div id="test13" role="group" aria-autocomplete="inline">X</div>
   <div id="test14" role="group" aria-autocomplete="list">X</div>
+  <div id="test15" role="combobox">X</div>
+  <div id="test16" role="combobox" aria-autocomplete="">X</div>
+  <div id="test17" role="combobox" aria-autocomplete="foo">X</div>
+  <div id="test18" role="combobox" aria-autocomplete="none">X</div>
+  <div id="test19" role="combobox" aria-autocomplete="both">X</div>
+  <div id="test20" role="combobox" aria-autocomplete="inline">X</div>
+  <div id="test21" role="combobox" aria-autocomplete="list">X</div>
 </div>
 <p id="description"></p>
 <div id="console"></div>
@@ -36,7 +43,7 @@
 
     description("This tests the exposure of aria-current");
     if (window.accessibilityController) {
-        for (var i = 1; i <= 14; i++) {
+        for (var i = 1; i <= 21; i++) {
             var axElement = accessibilityController.accessibleElementById("test" + i);
             debug("\ntest" + i + " supports autocompletion: " + axElement.boolAttributeValue("AXSupportsAutoCompletion"));
             debug(platformAttributes(axElement));

Source/WebCore/ChangeLog

@@ -1,3 +1,18 @@
+2017-09-11  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: [ATK] aria-autocomplete not exposed on comboboxes
+        https://bugs.webkit.org/show_bug.cgi?id=176724
+
+        Reviewed by Chris Fleizach.
+
+        Add a check to AccessibilityObject::supportsARIAAutoComplete() for
+        combobox because isARIATextControl() returns false for that role.
+
+        Add new combobox test cases to existing aria-autocomplete.html test.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::supportsARIAAutoComplete const):
+
 2017-09-10  Zan Dobersek  <zdobersek@igalia.com>
 
         [GStreamer] Drop libgcrypt initialization in webkit_media_clear_key_decrypt_init()

Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1680,7 +1680,7 @@ String AccessibilityObject::ariaReadOnlyValue() const
 
 bool AccessibilityObject::supportsARIAAutoComplete() const
 {
-    return isARIATextControl() && hasAttribute(aria_autocompleteAttr);
+    return (isComboBox() || isARIATextControl()) && hasAttribute(aria_autocompleteAttr);
 }
 
 String AccessibilityObject::ariaAutoCompleteValue() const