bug 110422 optimize XBL accessible code

r=aaronl,rginda sr=jag
2002-01-14 20:56:49 +00:00 · 2002-01-14 20:56:49 +00:00 · cc5fb98518
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@ -753,7 +753,7 @@ nsAccessibilityService::CreateXULImageAccessible(nsIDOMNode *aNode, nsIAccessibl
  *_retval = nsnull;

  nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(aNode));
-  if (NS_WARN_IF_FALSE(elt, "No DOM element or node!"))
+  if (!elt)
    return NS_ERROR_FAILURE;
  PRBool hasTextEquivalent;
  elt->HasAttribute(NS_LITERAL_STRING("tooltiptext"), &hasTextEquivalent); // Prefer value over tooltiptext
--- a/xpfe/global/resources/content/bindings/browser.xml
+++ b/xpfe/global/resources/content/bindings/browser.xml
@ -44,7 +44,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createIFrameAccessible(this): null);
+            return accService.createIFrameAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/button.xml
+++ b/xpfe/global/resources/content/bindings/button.xml
@ -10,7 +10,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULButtonAccessible(this): null);
+            return accService.createXULButtonAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/checkbox.xml
+++ b/xpfe/global/resources/content/bindings/checkbox.xml
@ -23,8 +23,7 @@
      <property name="accessible">
        <getter>
          <![CDATA[
-            var accService = Components.classes["@mozilla.org/accessibilityService;1"]
-                                       .getService(Components.interfaces.nsIAccessibilityService);
+            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
            return accService.createXULCheckboxAccessible(this);
          ]]>
        </getter>
--- a/xpfe/global/resources/content/bindings/colorpicker.xml
+++ b/xpfe/global/resources/content/bindings/colorpicker.xml
@ -428,7 +428,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULColorPickerAccessible(this): null);
+            return accService.createXULColorPickerAccessible(this);
          ]]>
        </getter>
      </property>
@ -559,7 +559,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULColorPickerTileAccessible(this): null);
+            return accService.createXULColorPickerTileAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/general.xml
+++ b/xpfe/global/resources/content/bindings/general.xml
@ -196,7 +196,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createIFrameAccessible(this): null);
+            return accService.createIFrameAccessible(this);
          ]]>
        </getter>
      </property>
@ -241,7 +241,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULStatusBarAccessible(this): null);
+            return accService.createXULStatusBarAccessible(this);
          ]]>
        </getter>
      </property>
@ -264,7 +264,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULImageAccessible(this): null);
+            return accService.createXULImageAccessible(this);
          ]]>
        </getter>
      </property>
@ -319,7 +319,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULDropmarkerAccessible(this): null);
+            return accService.createXULDropmarkerAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/groupbox.xml
+++ b/xpfe/global/resources/content/bindings/groupbox.xml
@ -25,7 +25,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULGroupboxAccessible(this): null);
+            return accService.createXULGroupboxAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/menu.xml
+++ b/xpfe/global/resources/content/bindings/menu.xml
@ -13,15 +13,12 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            if (accService) {
-              if (this.localName == "menuseparator")
-                return accService.createXULMenuSeparatorAccessible(this);
-              if (this.parentNode && this.parentNode.parentNode &&
-                  this.parentNode.localName == "menupopup" && this.parentNode.parentNode.localName == "menulist")
-                return accService.createXULSelectOptionAccessible(this);
-              return accService.createXULMenuitemAccessible(this);
-              }
-            return null;
+            if (this.localName == "menuseparator")
+              return accService.createXULMenuSeparatorAccessible(this);
+            if (this.parentNode && this.parentNode.parentNode &&
+                this.parentNode.localName == "menupopup" && this.parentNode.parentNode.localName == "menulist")
+              return accService.createXULSelectOptionAccessible(this);
+            return accService.createXULMenuitemAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/menulist.xml
+++ b/xpfe/global/resources/content/bindings/menulist.xml
@ -235,7 +235,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULComboboxAccessible(this): null);
+            return accService.createXULComboboxAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/popup.xml
+++ b/xpfe/global/resources/content/bindings/popup.xml
@ -23,9 +23,8 @@
          <![CDATA[
            if (this.localName == "popup" || this.localName == "menupopup") {
              var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-              if (accService)
-                return (this.parentNode.localName == "menulist")? accService.createXULComboboxWindowAccessible: accService.createXULMenupopupAccessible(this);
-              }
+              return (this.parentNode.localName == "menulist")? accService.createXULComboboxWindowAccessible: accService.createXULMenupopupAccessible(this);
+            }
            return null;
          ]]>
        </getter>
--- a/xpfe/global/resources/content/bindings/progressmeter.xml
+++ b/xpfe/global/resources/content/bindings/progressmeter.xml
@ -41,7 +41,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULProgressMeterAccessible(this): null);
+            return accService.createXULProgressMeterAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/radio.xml
+++ b/xpfe/global/resources/content/bindings/radio.xml
@ -14,7 +14,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULRadioGroupAccessible(this): null);
+            return accService.createXULRadioGroupAccessible(this);
          ]]>
        </getter>
      </property>
@ -304,7 +304,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULRadioButtonAccessible(this): null);
+            return accService.createXULRadioButtonAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/tabbox.xml
+++ b/xpfe/global/resources/content/bindings/tabbox.xml
@ -17,7 +17,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULTabBoxAccessible(this): null);
+            return accService.createXULTabBoxAccessible(this);
          ]]>
        </getter>
      </property>
@ -171,7 +171,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULTabsAccessible(this): null);
+            return accService.createXULTabsAccessible(this);
          ]]>
        </getter>
      </property>
@ -344,7 +344,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULTabPanelsAccessible(this): null);
+            return accService.createXULTabPanelsAccessible(this);
          ]]>
        </getter>
      </property>
@ -403,7 +403,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULTabAccessible(this): null);
+            return accService.createXULTabAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/text.xml
+++ b/xpfe/global/resources/content/bindings/text.xml
@ -11,7 +11,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULTextAccessible(this): null);
+            return accService.createXULTextAccessible(this);
          ]]>
        </getter>
      </property>
--- a/xpfe/global/resources/content/bindings/toolbar.xml
+++ b/xpfe/global/resources/content/bindings/toolbar.xml
@ -182,7 +182,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULMenubarAccessible(this): null);
+            return accService.createXULMenubarAccessible(this);
          ]]>
        </getter>
       </property>
--- a/xpfe/global/resources/content/bindings/toolbarbutton.xml
+++ b/xpfe/global/resources/content/bindings/toolbarbutton.xml
@ -64,7 +64,7 @@
        <getter>
          <![CDATA[
            var accService = Components.classes["@mozilla.org/accessibilityService;1"].getService(Components.interfaces.nsIAccessibilityService);
-            return (accService? accService.createXULDropmarkerAccessible(this): null);
+            return accService.createXULDropmarkerAccessible(this);
          ]]>
        </getter>
      </property>