Bug 1476611 - Part 1 - Remove unused listbox methods. r=bgrins
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Thu, 26 Jul 2018 14:05:16 +0100
changeset 428606 162e063abd54c9f29c21a6f0878f8d43434b8904
parent 428605 ced9b3994cf4316a57e1777bb3738cc350a1196d
child 428607 a0f8e3ef3a72fe282e794a4138b7270c3ff49366
push id34337
push userncsoregi@mozilla.com
push dateThu, 26 Jul 2018 21:58:45 +0000
treeherdermozilla-central@8f2f847b2f9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1476611
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1476611 - Part 1 - Remove unused listbox methods. r=bgrins MozReview-Commit-ID: JDyuZFDPldV
browser/themes/osx/browser.css
browser/themes/shared/toolbarbuttons.inc.css
toolkit/content/widgets/listbox.xml
toolkit/content/widgets/richlistbox.xml
toolkit/themes/osx/global/findBar.css
toolkit/themes/shared/findBar.inc.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -208,24 +208,16 @@
 #panelMenu_unsortedBookmarks {
   list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.svg");
 }
 
 %include ../shared/toolbarbuttons.inc.css
 %include ../shared/toolbarbutton-icons.inc.css
 %include ../shared/menupanel.inc.css
 
-/* Override OSX-specific toolkit findbar button styles */
-.findbar-button {
-  background: none;
-  box-shadow: none;
-  border: none;
-  color: inherit;
-}
-
 /* On Mac, native buttons keep their full opacity when they become disabled
  * and only the glyph or text on top of them becomes less opaque. */
 :root:not([customizing]) #back-button[disabled="true"] {
   opacity: 1 !important;
   /* Disabled toolbar buttons get an opacity of 0.4 which multiplies
    * their fill-opacity of 0.7. calc() doesn't work here - we'd need
    * to multiply two unitless numbers and that's invalid in CSS, so
    * we need to hard code the value for now. */
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -86,22 +86,16 @@ toolbar[brighttext] {
 #navigator-toolbox:not(:hover) > #TabsToolbar > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-down:not([highlight]) {
   transition: 1s background-color ease-out;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-down[highlight] {
   background-color: Highlight;
 }
 
-.findbar-button {
-  -moz-appearance: none;
-  padding: 0;
-  color: inherit;
-}
-
 toolbar .toolbarbutton-1 {
   -moz-appearance: none;
   margin: 0;
   padding: 0 var(--toolbarbutton-outer-padding);
   -moz-box-pack: center;
 }
 
 :root:not([uidensity=compact]) #PanelUI-menu-button {
old mode 100644
new mode 100755
--- a/toolkit/content/widgets/listbox.xml
+++ b/toolkit/content/widgets/listbox.xml
@@ -26,22 +26,16 @@
 
     /** Return item at given index
     * @param aIndex - index of item element */
     getItemAtIndex(aIndex)
 
     /** Return count of item elements */
     getRowCount()
 
-    /** Return count of visible item elements */
-    getNumberOfVisibleRows()
-
-    /** Return index of first visible item element */
-    getIndexOfFirstVisibleRow()
-
     /** Return true if item of given index is visible
      * @param aIndex - index of item element
      *
      * @note XXX: this method should be removed after bug 364612 is fixed
      */
     ensureIndexIsVisible(aIndex)
 
     /** Return true if item element is visible
@@ -444,55 +438,16 @@
 
             this.currentItem = newItem;
           }
         ]]>
         </body>
       </method>
 
     <!-- Private -->
-      <method name="getNextItem">
-        <parameter name="aStartItem"/>
-        <parameter name="aDelta"/>
-        <body>
-        <![CDATA[
-          while (aStartItem) {
-            aStartItem = aStartItem.nextSibling;
-            if (aStartItem && aStartItem instanceof
-                Ci.nsIDOMXULSelectControlItemElement &&
-                (!this._userSelecting || this._canUserSelect(aStartItem))) {
-              --aDelta;
-              if (aDelta == 0)
-                return aStartItem;
-            }
-          }
-          return null;
-        ]]></body>
-      </method>
-
-      <method name="getPreviousItem">
-        <parameter name="aStartItem"/>
-        <parameter name="aDelta"/>
-        <body>
-        <![CDATA[
-          while (aStartItem) {
-            aStartItem = aStartItem.previousSibling;
-            if (aStartItem && aStartItem instanceof
-                Ci.nsIDOMXULSelectControlItemElement &&
-                (!this._userSelecting || this._canUserSelect(aStartItem))) {
-              --aDelta;
-              if (aDelta == 0)
-                return aStartItem;
-            }
-          }
-          return null;
-        ]]>
-        </body>
-      </method>
-
       <method name="_moveByOffsetFromUserEvent">
         <parameter name="aOffset"/>
         <parameter name="aEvent"/>
         <body>
         <![CDATA[
           if (!aEvent.defaultPrevented) {
             this._userSelecting = true;
             this._mayReverse = true;
@@ -653,18 +608,16 @@
           return val;
         ]]></setter>
       </property>
 
       <!-- ///////////////// nsIDOMXULSelectControlItemElement ///////////////// -->
 
       <property name="value" onget="return this.getAttribute('value');"
                              onset="this.setAttribute('value', val); return val;"/>
-      <property name="label" onget="return this.getAttribute('label');"
-                             onset="this.setAttribute('label', val); return val;"/>
 
       <property name="selected" onget="return this.getAttribute('selected') == 'true';">
         <setter><![CDATA[
           if (val)
             this.setAttribute("selected", "true");
           else
             this.removeAttribute("selected");
 
--- a/toolkit/content/widgets/richlistbox.xml
+++ b/toolkit/content/widgets/richlistbox.xml
@@ -20,32 +20,20 @@
     </content>
 
     <implementation>
       <field name="_scrollbox">
         document.getAnonymousElementByAttribute(this, "anonid", "main-box");
       </field>
       <constructor>
         <![CDATA[
-          // add a template build listener
-          if (this.builder)
-            this.builder.addListener(this._builderListener);
-          else
-            this._refreshSelection();
+          this._refreshSelection();
         ]]>
       </constructor>
 
-      <destructor>
-        <![CDATA[
-          // remove the template build listener
-          if (this.builder)
-            this.builder.removeListener(this._builderListener);
-        ]]>
-      </destructor>
-
     <!-- Overriding baselistbox -->
       <method name="_fireOnSelect">
         <body>
           <![CDATA[
             // make sure not to modify last-selected when suppressing select events
             // (otherwise we'll lose the selection when a template gets rebuilt)
             if (this._suppressOnSelect || this.suppressOnSelect)
               return;
@@ -210,31 +198,16 @@
           <![CDATA[
             var item = this.getItemAtIndex(aIndex);
             if (item)
               this._scrollbox.scrollToElement(item);
           ]]>
         </body>
       </method>
 
-      <method name="getNumberOfVisibleRows">
-        <!-- returns the number of currently visible rows                -->
-        <!-- don't rely on this function, if the items' height can vary! -->
-        <body>
-          <![CDATA[
-            var children = this.children;
-
-            for (var top = 0; top < children.length && !this._isItemVisible(children[top]); top++);
-            for (var ix = top; ix < children.length && this._isItemVisible(children[ix]); ix++);
-
-            return ix - top;
-          ]]>
-        </body>
-      </method>
-
       <method name="getIndexOfFirstVisibleRow">
         <body>
           <![CDATA[
             var children = this.children;
 
             for (var ix = 0; ix < children.length; ix++)
               if (this._isItemVisible(children[ix]))
                 return ix;
@@ -306,29 +279,16 @@
             if (this.dir == "reverse" && this._mayReverse) {
               children.reverse();
             }
             return children;
           ]]>
         </getter>
       </property>
 
-      <field name="_builderListener" readonly="true">
-        <![CDATA[
-          ({
-            mOuter: this,
-            item: null,
-            willRebuild(builder) { },
-            didRebuild(builder) {
-              this.mOuter._refreshSelection();
-            }
-          });
-        ]]>
-      </field>
-
       <method name="_refreshSelection">
         <body>
           <![CDATA[
             // when this method is called, we know that either the currentItem
             // and selectedItems we have are null (ctor) or a reference to an
             // element no longer in the DOM (template).
 
             // first look for the last-selected attribute
@@ -426,59 +386,24 @@
                    (aItem.boxObject.y < y + this._scrollbox.boxObject.height);
           ]]>
         </body>
       </method>
 
       <field name="_currentIndex">null</field>
 
       <!-- For backwards-compatibility and for convenience.
-        Use getIndexOfItem instead. -->
-      <method name="getIndexOf">
-        <parameter name="aElement"/>
-        <body>
-          <![CDATA[
-            return this.getIndexOfItem(aElement);
-          ]]>
-        </body>
-      </method>
-
-      <!-- For backwards-compatibility and for convenience.
         Use ensureElementIsVisible instead -->
       <method name="ensureSelectedElementIsVisible">
         <body>
           <![CDATA[
             return this.ensureElementIsVisible(this.selectedItem);
           ]]>
         </body>
       </method>
-
-      <!-- For backwards-compatibility and for convenience.
-        Use moveByOffset instead. -->
-      <method name="goUp">
-        <body>
-          <![CDATA[
-            var index = this.currentIndex;
-            this.moveByOffset(-1, true, false);
-            return index != this.currentIndex;
-          ]]>
-        </body>
-      </method>
-      <method name="goDown">
-        <body>
-          <![CDATA[
-            var index = this.currentIndex;
-            this.moveByOffset(1, true, false);
-            return index != this.currentIndex;
-          ]]>
-        </body>
-      </method>
-
-      <!-- deprecated (is implied by currentItem and selectItem) -->
-      <method name="fireActiveItemEvent"><body/></method>
     </implementation>
 
     <handlers>
       <handler event="click">
         <![CDATA[
           // clicking into nothing should unselect
           if (event.originalTarget == this._scrollbox) {
             this.clearSelection();
--- a/toolkit/themes/osx/global/findBar.css
+++ b/toolkit/themes/osx/global/findBar.css
@@ -40,20 +40,20 @@ label.findbar-find-fast:-moz-lwtheme {
   border-style: @roundButtonBorderStyle@;
   border-color: @roundButtonBorderColor@;
   color: @roundButtonColor@;
   background: @roundButtonBackground@;
 }
 
 .findbar-button {
   -moz-appearance: none;
-  border-width: @roundButtonBorderWidth@;
   margin-inline-end: 5px;
-  padding: 2px 9px;
-  border-radius: 10000px;
+  padding: 0;
+  color: inherit;
+  background: none;
 }
 
 .findbar-find-next:-moz-lwtheme,
 .findbar-find-previous:-moz-lwtheme {
   border-color: var(--lwt-toolbar-field-border-color, @roundButtonBorderColor@);
 }
 
 .findbar-find-next:not(:-moz-lwtheme):not([disabled]):hover:active,
--- a/toolkit/themes/shared/findBar.inc.css
+++ b/toolkit/themes/shared/findBar.inc.css
@@ -37,16 +37,22 @@ findbar[noanim] {
   padding-top: 4px;
   padding-bottom: 4px;
 }
 
 .findbar-closebutton {
   padding: 0 8px;
 }
 
+.findbar-button {
+  -moz-appearance: none;
+  padding: 0;
+  color: inherit;
+}
+
 /* Search field */
 
 .findbar-textbox {
   -moz-appearance: none;
   background-color: -moz-Field;
   border: 1px solid var(--lwt-toolbar-field-border-color, ThreeDShadow);
   border-radius: 2px;
   margin: 0;