Bug 963506 - Get rid of all references to NSIAccessibleProvider, r=florian, r=bwinton
authorMarco Zehe <mzehe@mozilla.com>
Fri, 24 Jan 2014 17:56:55 +0100
changeset 19342 62c82ae99b5133b243c116b9a7e6128b0833f567
parent 19341 52e6bc2710750c6da29ec18f445f1b64cf1825e8
child 19343 929ee62f22ff2bfe180268fbe5936414aac27369
push id1103
push usermbanner@mozilla.com
push dateTue, 18 Mar 2014 07:44:06 +0000
treeherdercomm-beta@50c6279a0af0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian, bwinton
bugs963506
Bug 963506 - Get rid of all references to NSIAccessibleProvider, r=florian, r=bwinton
chat/content/convbrowser.xml
im/content/preferences/smiley.xml
mail/base/content/threadPaneColumnPicker.xml
mail/components/im/content/badgebutton.xml
--- a/chat/content/convbrowser.xml
+++ b/chat/content/convbrowser.xml
@@ -3,29 +3,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <bindings id="browserBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <binding id="browser">
+  <binding id="browser" role="outerdoc">
     <implementation type="application/javascript"
-                    implements="nsIAccessibleProvider, nsIDOMEventListener,
+                    implements="nsIDOMEventListener,
                                 nsIWebProgressListener, nsIController,
                                 nsISelectionListener, nsIObserver">
-      <property name="accessibleType" readonly="true">
-        <getter>
-          <![CDATA[
-            return Components.interfaces.nsIAccessibleProvider.OuterDoc;
-          ]]>
-        </getter>
-      </property>
-
       <property name="autoscrollEnabled">
         <getter>
           <![CDATA[
             if (this.getAttribute("autoscroll") == "false")
               return false;
 
             var enabled = true;
             try {
--- a/im/content/preferences/smiley.xml
+++ b/im/content/preferences/smiley.xml
@@ -18,23 +18,15 @@
         </xul:hbox>
         <xul:label flex="1" class="smileyTextCodes" crop="end" xbl:inherits="value=smileyTextCodes"/>
       </xul:hbox>
     </content>
   </binding>
 
   <!-- chrome://global/content/bindings/tree.xml#treecol simplified so
    that we don't throw JS errors from the onclick handler -->
-  <binding id="treecol" extends="chrome://global/content/bindings/tree.xml#tree-base">
+  <binding id="treecol" role="xul:treecolumnitem"
+           extends="chrome://global/content/bindings/tree.xml#tree-base">
     <content>
       <xul:label class="treecol-text" xbl:inherits="crop,value=label" flex="1" crop="right"/>
     </content>
-    <implementation implements="nsIAccessibleProvider">
-      <property name="accessibleType" readonly="true">
-        <getter>
-          <![CDATA[
-            return Components.interfaces.nsIAccessibleProvider.XULTreeColumnItem;
-          ]]>
-        </getter>
-      </property>
-    </implementation>
   </binding>
 </bindings>
--- a/mail/base/content/threadPaneColumnPicker.xml
+++ b/mail/base/content/threadPaneColumnPicker.xml
@@ -18,17 +18,17 @@
     - Because the columnpicker is implicitly created by the treecols binding
     - and it does not pass anything in, we are compelled to override the binding
     - (via CSS rules in messenger.css) in order to add custom menu options to
     - the list.
     -
     - This is now a cut-paste-modify of the original tree.xml#columnpicker
     - since we had to override everything save for the accessibleType anyways.
     -->
-  <binding id="threadPaneColumnPicker" display="xul:button"
+  <binding id="threadPaneColumnPicker" display="xul:button" role="xul:button"
            extends="chrome://global/content/bindings/tree.xml#tree-base">
     <content>
       <xul:image class="tree-columnpicker-icon"/>
       <xul:menupopup anonid="popup">
         <xul:menuseparator anonid="menuseparator"/>
         <xul:menuitem anonid="reset" label="&columnPicker.resetToInbox.label;"/>
         <xul:menu anonid="applyTo-menu"
                   label="&columnPicker.applyTo.label;">
@@ -49,23 +49,17 @@
                              showAccountsFileHere="true"
                              position="start_before"/>
             </xul:menu>
           </xul:menupopup>
         </xul:menu>
       </xul:menupopup>
     </content>
 
-    <implementation implements="nsIAccessibleProvider">
-      <property name="accessibleType" readonly="true">
-        <getter>
-          return Components.interfaces.nsIAccessibleProvider.XULButton;
-        </getter>
-      </property>
-
+    <implementation>
       <method name="buildPopup">
         <parameter name="aPopup"/>
         <body>
           <![CDATA[
             while (aPopup.childNodes.length > 3)
               aPopup.removeChild(aPopup.firstChild);
 
             var refChild = aPopup.firstChild;
--- a/mail/components/im/content/badgebutton.xml
+++ b/mail/components/im/content/badgebutton.xml
@@ -7,37 +7,32 @@
 
 <bindings id="badgebuttonBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="badgebutton"
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton"
-           display="xul:button">
+           display="xul:button" role="xul:toolbarbutton">
     <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:stack>
         <xul:hbox>
           <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
         </xul:hbox>
         <xul:label class="badgeButton-badge" anonid="badge"/>
       </xul:stack>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
                  xbl:inherits="value=label,accesskey,crop"/>
     </content>
-    <implementation implements="nsIAccessibleProvider">
+    <implementation>
       <field name="_badgeCount">
       0
       </field>
-      <property name="accessibleType" readonly="true">
-        <getter>
-          return Components.interfaces.nsIAccessibleProvider.XULToolbarButton;
-        </getter>
-      </property>
 
       <property name="badgeCount" onget="return this._badgeCount;"
                                   onset="return this._setBadgeCount(val);">
       </property>
 
       <method name="_setBadgeCount">
         <parameter name="aNewCount"/>
         <body>