From 3c2cc88e2d64755dc6d8dc6a26c9c22d4ac94d73 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH] Bug 349259.  Allow pages to override line-height on form
 controls, except for <select>.  r=dbaron

---
 layout/style/forms.css                 | 16 ++++++++--------
 layout/style/test/test_animations.html |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/layout/style/forms.css b/layout/style/forms.css
index c23bc6894f2..1c5f1bc3ca2 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -97,13 +97,7 @@ input {
   color: -moz-FieldText;
   font: -moz-field;
   text-rendering: optimizeLegibility;
-  /*
-   * Note that the "UA !important" tests in
-   * layout/style/test/test_animations.html depend on this rule, because
-   * they need some UA !important rule to test.  If this changes, use a
-   * different one there.
-   */
-  line-height: normal !important;
+  line-height: normal;
   text-align: start;
   text-transform: none;
   word-spacing: normal;
@@ -219,6 +213,12 @@ select {
   background-color: -moz-Combobox;
   color: -moz-ComboboxText;
   font: -moz-list;
+  /*
+   * Note that the "UA !important" tests in
+   * layout/style/test/test_animations.html depend on this rule, because
+   * they need some UA !important rule to test.  If this changes, use a
+   * different one there.
+   */
   line-height: normal !important;
   white-space: nowrap !important;
   word-wrap: normal !important;
@@ -537,7 +537,7 @@ input[type="submit"] {
   background-color: ButtonFace;
   color: ButtonText; 
   font: -moz-button;
-  line-height: normal !important;
+  line-height: normal;
   white-space: pre;
   cursor: default;
   -moz-box-sizing: border-box;
diff --git a/layout/style/test/test_animations.html b/layout/style/test/test_animations.html
index ccb7df0d24a..8a59ff58fe0 100644
--- a/layout/style/test/test_animations.html
+++ b/layout/style/test/test_animations.html
@@ -1203,12 +1203,12 @@ done_div();
 
 // Test that UA !important rules override animations.
 // This test depends on forms.css having a rule
-//   input { line-height: !important }
+//   select { line-height: !important }
 // If that rule changes, we should rewrite it to depend on a different rule.
-new_element("input", "");
+new_element("select", "");
 var default_line_height = cs.lineHeight;
 done_div();
-new_element("input", "-moz-animation: uaoverride 2s linear infinite");
+new_element("select", "-moz-animation: uaoverride 2s linear infinite");
 is(cs.lineHeight, default_line_height,
    "animations should not override UA !important at 0ms");
 is(cs.marginTop, "20px",