From 60605e7f2dad7de7095548c88379af7d778f4185 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Sun, 23 Oct 2005 19:53:51 +0000
Subject: [PATCH] Avoid incremental reflow bug in marquee in some cases.  Bug
 312770, patch by Martijn Wargers <martijn.martijn@gmail.com>, r=doron,
 sr=bzbarsky

---
 layout/style/xbl-marquee/xbl-marquee.css |  5 ++++-
 layout/style/xbl-marquee/xbl-marquee.xml | 14 ++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/layout/style/xbl-marquee/xbl-marquee.css b/layout/style/xbl-marquee/xbl-marquee.css
index 0dfbeacb6757..85086cbee7fa 100644
--- a/layout/style/xbl-marquee/xbl-marquee.css
+++ b/layout/style/xbl-marquee/xbl-marquee.css
@@ -50,5 +50,8 @@ marquee[height*="7"], marquee[height*="8"], marquee[height*="9"] {
     margin: 0 !important; 
     padding: 0 !important;
   } /* This hack is needed until bug 119078 gets fixed */
- 
+
+  .innerDiv {
+    white-space: normal !important;
+  }
 }
diff --git a/layout/style/xbl-marquee/xbl-marquee.xml b/layout/style/xbl-marquee/xbl-marquee.xml
index 1cc06e9e60a0..7f73a97ef326 100644
--- a/layout/style/xbl-marquee/xbl-marquee.xml
+++ b/layout/style/xbl-marquee/xbl-marquee.xml
@@ -137,7 +137,7 @@
       />
 
       <property name="innerDiv"
-        onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'innerDiv');"
+        onget="return document.getAnonymousElementByAttribute(this, 'class', 'innerDiv');"
       />
 
       <property name="height"
@@ -225,12 +225,6 @@
               this.innerDiv.style.padding = height + " 0";
               this.innerDiv.style.whiteSpace = "";
             }
-            else {
-              this.outerDiv.style.height = "";
-
-              this.innerDiv.style.padding = "0px";
-              this.innerDiv.style.whiteSpace = "nowrap";
-            }
 
             switch (this.directionField)
             {
@@ -379,8 +373,8 @@
 
     <content>
       <html:div xbl:inherits="" style="overflow: -moz-scrollbars-none">
-        <html:div style="display:table; margin: 0 100%;">
-          <html:div anonid="innerDiv">
+        <html:div style="display:table; border-spacing:0; margin: 0 100%;">
+          <html:div class="innerDiv" style="white-space: nowrap;">
             <children/>
           </html:div>
         </html:div>
@@ -394,7 +388,7 @@
 
     <content>
       <html:div xbl:inherits="" style="overflow: -moz-scrollbars-none">
-        <html:div anonid="innerDiv">
+        <html:div class="innerDiv">
           <children/>
         </html:div>
       </html:div>