Bug 973344, part 1 - Remove workaround introduced by bug 947718 now that bug 946184 is fixed, especially since it causes crashes with the dom.forms.number pref disabled. r=ehsan, a=lsblakk
authorJonathan Watt <jwatt@jwatt.org>
Tue, 18 Feb 2014 16:36:04 +0000
changeset 176331 e8f98bacb0b2420efa8c8855af309ce16d3f859d
parent 176330 ca5a047a97d53c07a25e432d96a50e57c628cac5
child 176332 f66b06faac65ecb2756f32e7a6888df2e4c14f1d
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan, lsblakk
bugs973344, 947718, 946184
milestone28.0
Bug 973344, part 1 - Remove workaround introduced by bug 947718 now that bug 946184 is fixed, especially since it causes crashes with the dom.forms.number pref disabled. r=ehsan, a=lsblakk
layout/style/forms.css
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -887,26 +887,24 @@ input[type=range]::-moz-range-thumb {
 
 input[type="number"] {
   -moz-appearance: number-input;
   /* Has to revert some properties applied by the generic input rule. */
   -moz-binding: none;
   width: 149px; /* to match type=text */
 }
 
-input[type=number] > div, /* work around bug 946184 */
 input[type=number]::-moz-number-wrapper {
   /* Prevent styling that would change the type of frame we construct. */
   display: flex;
   float: none !important;
   position: static !important;
   height: 100%;
 }
 
-input[type=number] > div > input, /* work around bug 946184 */
 input[type=number]::-moz-number-text {
   -moz-appearance: none;
   /* work around autofocus bug 939248 on initial load */
   -moz-user-modify: read-write;
   /* This pseudo-element is also an 'input' element (nested inside and
    * distinct from the <input type=number> element) so we need to prevent the
    * explicit setting of 'text-align' by the general CSS rule for 'input'
    * above. We want to inherit its value from its <input type=number>
@@ -914,48 +912,45 @@ input[type=number]::-moz-number-text {
    */
   text-align: inherit;
   flex: 1;
   padding: 0;
   border: 0;
   margin: 0;
 }
 
-input[type=number] > div > div, /* work around bug 946184 */
 input[type=number]::-moz-number-spin-box {
   display: flex;
   flex-direction: column;
 %ifdef XP_WIN
   /* The Window's Theme's spin buttons have a very narrow minimum width, so
    * make it something reasonable:
    */
   width: 16px;
 %endif
   height: 0;
   align-self: center;
   justify-content: center;
 }
 
-input[type=number] > div > div > div:first-child, /* work around bug 946184 */
 input[type=number]::-moz-number-spin-up {
   -moz-appearance: spinner-upbutton;
   display: block; /* bug 926670 */
   flex: none;
   cursor: default;
   /* Style for when native theming is off: */
   background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="6" height="5"><path d="M1,4 L3,0 5,4" fill="dimgrey"/></svg>');
   background-repeat: no-repeat;
   background-position: center bottom;
   border: 1px solid darkgray;
   border-bottom: none;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
 }
 
-input[type=number] > div > div > div:not(:first-child), /* work around bug 946184 */
 input[type=number]::-moz-number-spin-down {
   -moz-appearance: spinner-downbutton;
   display: block; /* bug 926670 */
   flex: none;
   cursor: default;
   /* Style for when native theming is off: */
   background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="6" height="5"><path d="M1,1 L3,5 5,1" fill="dimgrey"/></svg>');
   background-repeat: no-repeat;