Move some marquee styles into a scoped binding sheet, and deal better with the

fact that the binding is not actually removed when printing.  Bug 170341, patch
by Martijn Wargers <martijn.martijn@gmail.com>, r+sr=bzbarsky, a=bsmeberg

layout/style/html.css

@@ -454,15 +454,6 @@ marquee[direction="up"], marquee[direction="down"] {
   height: 200px;
 }
 
-/* Marquees with a height attr that actually specifies a height should have
-   auto CSS height here.  Note that this rule has the same specificity as the
-   preceding one, so it has to come later in the sheet to work. */
-marquee[height*="1"], marquee[height*="2"], marquee[height*="3"],
-marquee[height*="4"], marquee[height*="5"], marquee[height*="6"],
-marquee[height*="7"], marquee[height*="8"], marquee[height*="9"] {
-  height: auto;
-}
-
 /* PRINT ONLY rules follow */
 @media print {
 

layout/style/xbl-marquee/jar.mn

@@ -5,3 +5,4 @@ comm.jar:
     content/xbl-marquee/contents.rdf
 #endif
     content/xbl-marquee/xbl-marquee.xml
+    content/xbl-marquee/xbl-marquee.css

layout/style/xbl-marquee/xbl-marquee.css

@@ -0,0 +1,54 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+/* Marquees with a height attr that actually specifies a height should have
+   auto CSS height here.  Note that this rule has the same specificity as the
+   preceding one, so it has to come later in the sheet to work. */
+marquee[height*="1"], marquee[height*="2"], marquee[height*="3"],
+marquee[height*="4"], marquee[height*="5"], marquee[height*="6"],
+marquee[height*="7"], marquee[height*="8"], marquee[height*="9"] {
+  height: auto;
+}
+
+/* PRINT ONLY rules follow */
+@media print {
+
+  marquee > * > * { 
+    margin: 0 !important; 
+    padding: 0 !important;
+  } /* This hack is needed until bug 119078 gets fixed */
+ 
+}

layout/style/xbl-marquee/xbl-marquee.xml

@@ -46,6 +46,9 @@
 
   <binding id="marquee" inheritstyle="false">
 
+    <resources>
+      <stylesheet src="chrome://xbl-marquee/content/xbl-marquee.css"/>
+    </resources>
     <implementation>
 
       <field name="defaultScrollAmount">6</field>