From ae20bb42034f07ceb3ced912eab3e0dbc106e3f7 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marco.zehe@googlemail.com>
Date: Mon, 2 Feb 2009 10:38:53 +0100
Subject: [PATCH] bug 469367 - Add ARIA semantics to those search widget types
 that don't have a Search button, r=dao, r=surkov

---
 accessible/tests/mochitest/test_textboxes.xul | 38 +++++++++++++++++++
 .../places/content/bookmarksPanel.xul         |  1 +
 .../places/content/history-panel.xul          |  1 +
 browser/components/places/content/places.xul  |  1 +
 .../components/preferences/applications.xul   |  1 +
 browser/components/preferences/cookies.xul    |  4 +-
 toolkit/components/help/content/help.xul      |  1 +
 .../passwordmgr/content/passwordManager.xul   |  1 +
 .../components/viewconfig/content/config.xul  |  4 +-
 toolkit/content/widgets/textbox.xml           | 21 ++++++++--
 .../mozapps/downloads/content/downloads.xul   |  1 +
 11 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/accessible/tests/mochitest/test_textboxes.xul b/accessible/tests/mochitest/test_textboxes.xul
index d18c6226198..7fd2b5f56ce 100644
--- a/accessible/tests/mochitest/test_textboxes.xul
+++ b/accessible/tests/mochitest/test_textboxes.xul
@@ -149,6 +149,36 @@
                "activate",  // ActionName
                "Activate"); // ActionDescription
 
+      //////////////////////////////////////////////////////////////////////////
+      // Search textbox without search button, searches as you type and filters
+      // a separate control.
+      testThis("search-box", // ID
+               "Search History:", // name
+               "", // value
+               "", // description
+               ROLE_ENTRY, // role
+               (STATE_FOCUSABLE), // state
+               (EXT_STATE_SUPPORTS_AUTOCOMPLETION), // extState
+               (0), // absentState
+               1, // numActions
+               "activate",  // ActionName
+               "Activate"); // ActionDescription
+
+      //////////////////////////////////////////////////////////////////////////
+      // Search textbox with search button, does not support autoCompletion.
+      testThis("searchfield", // ID
+               "Search all add-ons", // name
+               "", // value
+               "", // description
+               ROLE_ENTRY, // role
+               (STATE_FOCUSABLE), // state
+               (0), // extState
+               (0), // absentState
+               1, // numActions
+               "activate",  // ActionName
+               "Activate"); // ActionDescription
+      testStates("searchfield", 0, 0, 0, EXT_STATE_SUPPORTS_AUTOCOMPLETION);
+
       SimpleTest.finish();
     }
 
@@ -208,5 +238,13 @@
       <textbox multiline="true" id="readonly_textarea" readonly="true" cols="80"
                rows="5" value="You cannot change me, either."/>
     </vbox>
+    <hbox>
+      <label value="Search History:" accesskey="S" 
+             control="search-box"/>
+	  <textbox id="search-box" flex="1" type="search" cocoa-size="small"
+	           results="historyTree"/>
+    </hbox>
+    <textbox id="searchfield" emptytext="Search all add-ons"
+             type="search" searchbutton="true" cocoa-size="small"/>
   </vbox>
 </window>
diff --git a/browser/components/places/content/bookmarksPanel.xul b/browser/components/places/content/bookmarksPanel.xul
index 068751bbb8a..0831ac8c0db 100644
--- a/browser/components/places/content/bookmarksPanel.xul
+++ b/browser/components/places/content/bookmarksPanel.xul
@@ -64,6 +64,7 @@
   <hbox align="center">
     <label value="&search.label;" accesskey="&search.accesskey;" control="search-box"/>
     <textbox id="search-box" flex="1" type="search" cocoa-size="small"
+             aria-controls="bookmarks-view"
              oncommand="searchBookmarks(this.value);"/>
   </hbox>
 
diff --git a/browser/components/places/content/history-panel.xul b/browser/components/places/content/history-panel.xul
index bc21c2286e5..e9345cca7a2 100644
--- a/browser/components/places/content/history-panel.xul
+++ b/browser/components/places/content/history-panel.xul
@@ -87,6 +87,7 @@
     <label value="&find.label;" accesskey="&find.accesskey;" 
            control="search-box"/>
     <textbox id="search-box" flex="1" type="search" cocoa-size="small"
+             aria-controls="historyTree"
              oncommand="searchHistory(this.value);"/>
     <button id="viewButton" style="min-width:0px !important;" type="menu"
             label="&view.label;" accesskey="&view.accesskey;" selectedsort="day"
diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
index ce561024e80..0255caa7a48 100644
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -389,6 +389,7 @@
       <textbox id="searchFilter"
                clickSelectsAll="true"
                type="search"
+               aria-controls="placeContent"
                oncommand="PlacesSearchBox.search(this.value);"
                collection="bookmarks">
       </textbox>
diff --git a/browser/components/preferences/applications.xul b/browser/components/preferences/applications.xul
index 8719d8ca521..f388750d3f9 100644
--- a/browser/components/preferences/applications.xul
+++ b/browser/components/preferences/applications.xul
@@ -114,6 +114,7 @@
       <textbox id="filter" flex="1"
                type="search"
                emptytext="&filter.emptytext;"
+               aria-controls="handlersView"
                oncommand="gApplicationsPane.filter();"/>
     </hbox>
 
diff --git a/browser/components/preferences/cookies.xul b/browser/components/preferences/cookies.xul
index 906b1de3c9f..858e36c2320 100644
--- a/browser/components/preferences/cookies.xul
+++ b/browser/components/preferences/cookies.xul
@@ -66,7 +66,9 @@
   <vbox flex="1" class="contentPane">
     <hbox align="center">
       <label accesskey="&filter.accesskey;" control="filter">&filter.label;</label>
-      <textbox type="search" id="filter" flex="1" oncommand="gCookiesWindow.filter();"/>
+      <textbox type="search" id="filter" flex="1"
+               aria-controls="cookiesList"
+               oncommand="gCookiesWindow.filter();"/>
     </hbox>
     <separator class="thin"/>
     <label control="cookiesList" id="cookiesIntro" value="&cookiesonsystem.label;"/>
diff --git a/toolkit/components/help/content/help.xul b/toolkit/components/help/content/help.xul
index 4e343c404c1..c3228c035c9 100644
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@@ -182,6 +182,7 @@
         <toolbaritem id="search-box"
                      align="center" pack="center">
           <textbox id="findText" type="search" emptytext="&search.emptytext;"
+                   aria-controls="help-toc-panel"
                    oncommand="doFind();"/>
         </toolbaritem>
       </toolbar>
diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul
index d83fe1a795e..947dd0fb8e6 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -70,6 +70,7 @@
     <hbox align="center">
       <label accesskey="&filter.accesskey;" control="filter">&filter.label;</label>
       <textbox id="filter" flex="1" type="search"
+               aria-controls="signonsTree"
                oncommand="_filterPasswords();"/>
     </hbox>
 
diff --git a/toolkit/components/viewconfig/content/config.xul b/toolkit/components/viewconfig/content/config.xul
index 00dbe21307c..cae5411ca73 100644
--- a/toolkit/components/viewconfig/content/config.xul
+++ b/toolkit/components/viewconfig/content/config.xul
@@ -100,7 +100,9 @@
   <vbox flex="1">
     <hbox id="filterRow" align="center">
       <label value="&filterPrefs.label;" accesskey="&filterPrefs.accesskey;" control="textbox"/>
-      <textbox id="textbox" flex="1" type="search" cocoa-size="small" oncommand="FilterPrefs();"/>
+      <textbox id="textbox" flex="1" type="search" cocoa-size="small"
+               aria-controls="configTree"
+               oncommand="FilterPrefs();"/>
     </hbox>
   
     <tree id="configTree" flex="1" seltype="single"
diff --git a/toolkit/content/widgets/textbox.xml b/toolkit/content/widgets/textbox.xml
index 12be60594fc..000bce7ae40 100644
--- a/toolkit/content/widgets/textbox.xml
+++ b/toolkit/content/widgets/textbox.xml
@@ -388,9 +388,18 @@
                 onset="this.setAttribute('timeout', val); return val;"
                 onget="return parseInt(this.getAttribute('timeout')) || 500;"/>
       <property name="searchButton"
-                onget="return this.hasAttribute('searchbutton');"
-                onset="if (val) this.setAttribute('searchbutton', 'true');
-                       else this.removeAttribute('searchbutton'); return val;"/>
+                onget="return this.getAttribute('searchbutton') == 'true';">
+        <setter><![CDATA[
+          if (val) {
+            this.setAttribute("searchbutton", "true");
+            this.removeAttribute("aria-autocomplete");
+          } else {
+            this.removeAttribute("searchbutton");
+            this.setAttribute("aria-autocomplete", "list");
+          }
+          return val;
+        ]]></setter>
+      </property>
       <property name="value"
                 onget="return this.hasAttribute('empty') ? '' : this.inputField.value;">
         <setter><![CDATA[
@@ -410,6 +419,12 @@
           return val;
         ]]></setter>
       </property>
+      <constructor><![CDATA[
+        if (this.searchButton)
+          this.removeAttribute("aria-autocomplete");
+        else
+          this.setAttribute("aria-autocomplete", "list");
+      ]]></constructor>
       <method name="_fireCommand">
         <parameter name="me"/>
         <body><![CDATA[
diff --git a/toolkit/mozapps/downloads/content/downloads.xul b/toolkit/mozapps/downloads/content/downloads.xul
index 1791b6fb0a0..50c8720b331 100644
--- a/toolkit/mozapps/downloads/content/downloads.xul
+++ b/toolkit/mozapps/downloads/content/downloads.xul
@@ -190,6 +190,7 @@
             tooltiptext="&cmd.clearList.tooltip;"/>
     <spacer flex="1"/>
     <textbox type="search" id="searchbox" cocoa-size="small"
+             aria-controls="downloadView"
              oncommand="buildDownloadList();" emptytext="&searchBox.label;"/>
   </windowdragbox>