Bug 1446157 - Remove unused grippy binding r=enndeakin+6102
☠☠ backed out by e1bd2a080612 ☠ ☠
authorTimothy Guan-tin Chien <timdream@gmail.com>
Tue, 20 Mar 2018 17:21:19 +0800
changeset 409505 de560a993de1
parent 409504 37e07672384d
child 409506 be65061c2d72
push id61532
push usertimdream@gmail.com
push dateThu, 22 Mar 2018 14:14:42 +0000
treeherderautoland@2491f8caeffa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenndeakin
bugs1446157
milestone61.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 1446157 - Remove unused grippy binding r=enndeakin+6102 MozReview-Commit-ID: KWC9HpTzig
layout/xul/nsSplitterFrame.cpp
toolkit/content/jar.mn
toolkit/content/widgets/splitter.xml
toolkit/content/xul.css
toolkit/themes/linux/global/splitter.css
toolkit/themes/osx/global/jar.mn
toolkit/themes/osx/global/splitter.css
toolkit/themes/osx/global/splitter/grip-bottom.gif
toolkit/themes/osx/global/splitter/grip-left.gif
toolkit/themes/osx/global/splitter/grip-right.gif
toolkit/themes/osx/global/splitter/grip-top.gif
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/windows/global/splitter.css
toolkit/themes/windows/global/splitter/grip-bottom.gif
toolkit/themes/windows/global/splitter/grip-left.gif
toolkit/themes/windows/global/splitter/grip-right.gif
toolkit/themes/windows/global/splitter/grip-top.gif
xpcom/ds/nsGkAtomList.h
--- a/layout/xul/nsSplitterFrame.cpp
+++ b/layout/xul/nsSplitterFrame.cpp
@@ -244,25 +244,17 @@ nsSplitterFrame::GetCursor(const nsPoint
 
 nsresult
 nsSplitterFrame::AttributeChanged(int32_t aNameSpaceID,
                                   nsAtom* aAttribute,
                                   int32_t aModType)
 {
   nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute,
                                              aModType);
-  // if the alignment changed. Let the grippy know
-  if (aAttribute == nsGkAtoms::align) {
-    // tell the slider its attribute changed so it can
-    // update itself
-    nsIFrame* grippy = nullptr;
-    nsScrollbarButtonFrame::GetChildWithTag(nsGkAtoms::grippy, this, grippy);
-    if (grippy)
-      grippy->AttributeChanged(aNameSpaceID, aAttribute, aModType);
-  } else if (aAttribute == nsGkAtoms::state) {
+  if (aAttribute == nsGkAtoms::state) {
     mInner->UpdateState();
   }
 
   return rv;
 }
 
 /**
  * Initialize us. If we are in a box get our alignment so we know what direction we are
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -89,17 +89,16 @@ toolkit.jar:
    content/global/bindings/radio.xml           (widgets/radio.xml)
    content/global/bindings/remote-browser.xml  (widgets/remote-browser.xml)
    content/global/bindings/resizer.xml         (widgets/resizer.xml)
    content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
    content/global/bindings/scale.xml           (widgets/scale.xml)
    content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
    content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
    content/global/bindings/spinner.js          (widgets/spinner.js)
-   content/global/bindings/splitter.xml        (widgets/splitter.xml)
    content/global/bindings/stringbundle.xml    (widgets/stringbundle.xml)
 *  content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
    content/global/bindings/text.xml            (widgets/text.xml)
 *  content/global/bindings/textbox.xml         (widgets/textbox.xml)
    content/global/bindings/timekeeper.js       (widgets/timekeeper.js)
    content/global/bindings/timepicker.js       (widgets/timepicker.js)
    content/global/bindings/toolbar.xml         (widgets/toolbar.xml)
    content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
deleted file mode 100644
--- a/toolkit/content/widgets/splitter.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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="splitterBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="grippy" extends="xul:button">
-    <handlers>
-      <handler event="command">
-        <![CDATA[
-          var splitter = this.parentNode;
-          if (splitter) {
-            var state = splitter.getAttribute("state");
-            if (state == "collapsed")
-              splitter.setAttribute("state", "open");
-            else
-              splitter.setAttribute("state", "collapsed");
-          }
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-
-</bindings>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -840,20 +840,16 @@ menulist > menupopup > menuitem {
 }
 
 dropmarker {
   -moz-binding: url("chrome://global/content/bindings/general.xml#dropmarker");
 }
 
 /********** splitter **********/
 
-grippy {
-  -moz-binding: url("chrome://global/content/bindings/splitter.xml#grippy");
-}
-
 .tree-splitter {
   width: 0px;
   max-width: 0px;
   min-width: 0% ! important;
   min-height: 0% ! important;
   -moz-box-ordinal-group: 2147483646;
 }
 
--- a/toolkit/themes/linux/global/splitter.css
+++ b/toolkit/themes/linux/global/splitter.css
@@ -45,21 +45,8 @@ splitter[orient="vertical"][state="colla
 splitter[orient="vertical"][state="collapsed"][collapse="after"],
 splitter[orient="vertical"][state="collapsed"][substate="after"] {
   cursor: n-resize;
 }
 
 splitter[disabled="true"] {
   cursor: default !important;
 }
-
-/* ::::: splitter grippy ::::: */
-
-grippy {
-  cursor: pointer;
-  min-width: 4px;
-  min-height: 115px;
-}
-
-splitter[orient="vertical"] > grippy {
-  min-width: 115px;
-  min-height: 4px;
-}
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -79,20 +79,16 @@ toolkit.jar:
   skin/classic/global/icons/error-64.png                             (icons/error-64.png)
   skin/classic/global/icons/question-16.png                          (icons/question-16.png)
   skin/classic/global/icons/question-32.png                          (icons/question-32.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                          (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css                      (in-content/info-pages.css)
   skin/classic/global/splitter/dimple.png                            (splitter/dimple.png)
-  skin/classic/global/splitter/grip-bottom.gif                       (splitter/grip-bottom.gif)
-  skin/classic/global/splitter/grip-top.gif                          (splitter/grip-top.gif)
-  skin/classic/global/splitter/grip-left.gif                         (splitter/grip-left.gif)
-  skin/classic/global/splitter/grip-right.gif                        (splitter/grip-right.gif)
   skin/classic/global/toolbar/spring.png                             (toolbar/spring.png)
   skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
   skin/classic/global/tree/arrow-disclosure.svg                      (tree/arrow-disclosure.svg)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
   skin/classic/global/tree/folder.png                                (tree/folder.png)
   skin/classic/global/tree/folder@2x.png                             (tree/folder@2x.png)
 
 #if MOZ_BUILD_APP == browser
--- a/toolkit/themes/osx/global/splitter.css
+++ b/toolkit/themes/osx/global/splitter.css
@@ -7,17 +7,17 @@
 /* ::::: splitter (vertical) ::::: */
 
 splitter {
   -moz-box-align: center;
   -moz-box-pack: center;
   cursor: ew-resize;
   min-width: 9px;
   min-height: 9px;
-  background: url("chrome://global/skin/splitter/dimple.png") transparent no-repeat center;  
+  background: url("chrome://global/skin/splitter/dimple.png") transparent no-repeat center;
 }
 
 splitter[state="collapsed"][collapse="before"],
 splitter[state="collapsed"][substate="before"],
 splitter[state="collapsed"][collapse="after"]:-moz-locale-dir(rtl),
 splitter[state="collapsed"][substate="after"]:-moz-locale-dir(rtl) {
   cursor: e-resize;
 }
@@ -34,91 +34,25 @@ splitter:-moz-lwtheme {
 }
 
 /* ::::: splitter (horizontal) ::::: */
 
 splitter[orient="vertical"] {
   cursor: ns-resize;
   min-width: 0px;
   min-height: 9px;
-  min-width: 9px;  
+  min-width: 9px;
   background: url("chrome://global/skin/splitter/dimple.png") transparent no-repeat center;
 }
 
 splitter[orient="vertical"][state="collapsed"][collapse="before"],
 splitter[orient="vertical"][state="collapsed"][substate="before"] {
   cursor: s-resize;
 }
 
 splitter[orient="vertical"][state="collapsed"][collapse="after"],
 splitter[orient="vertical"][state="collapsed"][substate="after"] {
   cursor: n-resize;
 }
 
 splitter[disabled="true"] {
   cursor: default !important;
 }
-
-/* ::::: splitter grippy ::::: */
-  
-grippy {
-  cursor: pointer;
-  margin: 0px 1px;
-  min-width: 4px;
-  min-height: 115px;
-  background-color: transparent;
-  background-repeat: no-repeat;
-}
-
-grippy:hover {
-  background-color: ThreeDHighlight;
-}
-
-splitter[orient="vertical"] > grippy {
-  margin: 1px 0px;
-  min-width: 115px;
-  min-height: 4px;
-}
-
-/* ..... normal state ..... */
-
-/* vertical grippies */
-splitter[collapse="before"] > grippy,
-splitter[collapse="after"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-left.gif");
-}
-
-splitter[collapse="after"] > grippy,
-splitter[collapse="before"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-right.gif");
-}
-
-/* horizontal grippies */
-splitter[collapse="before"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-top.gif");
-}
-
-splitter[collapse="after"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-bottom.gif");
-}
-
-/* ..... collapsed state ..... */
-
-/* vertical grippies */
-splitter[collapse="before"][state="collapsed"] > grippy,
-splitter[collapse="after"][state="collapsed"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-right.gif");
-}
-
-splitter[collapse="after"][state="collapsed"] > grippy,
-splitter[collapse="before"][state="collapsed"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-left.gif");
-}
-
-/* horizontal grippies */
-splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-bottom.gif");
-}
-
-splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-top.gif");
-}
-
deleted file mode 100644
index af6290fe9deacdcdab045c2d7c81df5c22d6bc92..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6be9bc4f400a8649794f0e26a10d898af3dd3698..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 71be69083efaa15f2b57c2a3a73929bec0353d48..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3cba0059461c6d52d41fda25610aecba188fa35b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -28,20 +28,16 @@
   skin/classic/global/icons/error-16.png                   (../../windows/global/icons/error-16.png)
   skin/classic/global/icons/question-16.png                (../../windows/global/icons/question-16.png)
   skin/classic/global/icons/question-64.png                (../../windows/global/icons/question-64.png)
   skin/classic/global/icons/resizer-rtl.png                (../../windows/global/icons/resizer-rtl.png)
   skin/classic/global/icons/search-textbox.svg             (../../windows/global/icons/search-textbox.svg)
   skin/classic/global/icons/tabprompts-bgtexture.png       (../../windows/global/icons/tabprompts-bgtexture.png)
   skin/classic/global/icons/warning-16.png                 (../../windows/global/icons/warning-16.png)
   skin/classic/global/icons/warning-64.png                 (../../windows/global/icons/warning-64.png)
-  skin/classic/global/splitter/grip-bottom.gif             (../../windows/global/splitter/grip-bottom.gif)
-  skin/classic/global/splitter/grip-top.gif                (../../windows/global/splitter/grip-top.gif)
-  skin/classic/global/splitter/grip-left.gif               (../../windows/global/splitter/grip-left.gif)
-  skin/classic/global/splitter/grip-right.gif              (../../windows/global/splitter/grip-right.gif)
   skin/classic/global/tree/columnpicker.gif                (../../windows/global/tree/columnpicker.gif)
   skin/classic/global/tree/sort-asc.png                    (../../windows/global/tree/sort-asc.png)
   skin/classic/global/tree/sort-dsc.png                    (../../windows/global/tree/sort-dsc.png)
   skin/classic/global/tree/sort-asc-classic.png            (../../windows/global/tree/sort-asc-classic.png)
   skin/classic/global/tree/sort-dsc-classic.png            (../../windows/global/tree/sort-dsc-classic.png)
 
   skin/classic/mozapps/downloads/downloadButtons.png         (../../windows/mozapps/downloads/downloadButtons.png)
   skin/classic/mozapps/downloads/unknownContentType.css      (../../windows/mozapps/downloads/unknownContentType.css)
--- a/toolkit/themes/windows/global/splitter.css
+++ b/toolkit/themes/windows/global/splitter.css
@@ -58,78 +58,8 @@ splitter[orient="vertical"][state="colla
 splitter[orient="vertical"][state="collapsed"][collapse="after"],
 splitter[orient="vertical"][state="collapsed"][substate="after"] {
   cursor: n-resize;
 }
 
 splitter[disabled="true"] {
   cursor: default !important;
 }
-
-/* ::::: splitter grippy ::::: */
-
-grippy {
-  cursor: pointer;
-  border-top: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
-  min-width: 4px;
-  min-height: 115px;
-  background-color: transparent;
-  background-repeat: no-repeat;
-}
-
-grippy:hover {
-  background-color: ThreeDHighlight;
-}
-
-splitter[orient="vertical"] > grippy {
-  border-top: none;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: none;
-  border-left: 1px solid ThreeDShadow;;
-  min-width: 115px;
-  min-height: 4px;
-}
-
-/* ..... normal state ..... */
-
-/* vertical grippies */
-splitter[collapse="before"] > grippy,
-splitter[collapse="after"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-left.gif");
-}
-
-splitter[collapse="after"] > grippy,
-splitter[collapse="before"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-right.gif");
-}
-
-/* horizontal grippies */
-splitter[collapse="before"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-top.gif");
-}
-
-splitter[collapse="after"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-bottom.gif");
-}
-
-/* ..... collapsed state ..... */
-
-/* vertical grippies */
-splitter[collapse="before"][state="collapsed"] > grippy,
-splitter[collapse="after"][state="collapsed"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-right.gif");
-}
-
-splitter[collapse="after"][state="collapsed"] > grippy,
-splitter[collapse="before"][state="collapsed"] > grippy:-moz-locale-dir(rtl) {
-  background-image: url("chrome://global/skin/splitter/grip-left.gif");
-}
-
-/* horizontal grippies */
-splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-bottom.gif");
-}
-
-splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-top.gif");
-}
-
deleted file mode 100644
index af6290fe9deacdcdab045c2d7c81df5c22d6bc92..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6be9bc4f400a8649794f0e26a10d898af3dd3698..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 71be69083efaa15f2b57c2a3a73929bec0353d48..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3cba0059461c6d52d41fda25610aecba188fa35b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/xpcom/ds/nsGkAtomList.h
+++ b/xpcom/ds/nsGkAtomList.h
@@ -501,17 +501,16 @@ GK_ATOM(freshProcess, "freshProcess")
 GK_ATOM(generateId, "generate-id")
 GK_ATOM(getter, "getter")
 GK_ATOM(glyphchar, "glyphchar")
 GK_ATOM(glyphid, "glyphid")
 GK_ATOM(graphicsDocument, "graphics-document")
 GK_ATOM(graphicsObject, "graphics-object")
 GK_ATOM(graphicsSymbol, "graphics-symbol")
 GK_ATOM(grid, "grid")
-GK_ATOM(grippy, "grippy")
 GK_ATOM(group, "group")
 GK_ATOM(groupbox, "groupbox")
 GK_ATOM(groupingSeparator, "grouping-separator")
 GK_ATOM(groupingSize, "grouping-size")
 GK_ATOM(grow, "grow")
 GK_ATOM(gutter, "gutter")
 GK_ATOM(h1, "h1")
 GK_ATOM(h2, "h2")