Bug 604885 commit backout merge. a=backout
authorChris Pearce <chris@pearce.org.nz>
Tue, 21 Dec 2010 07:45:28 +1300
changeset 59522 a92cfed15419bb75893f1adcbb2808c2858cafc8
parent 59520 ea5076f3b4fe2fa4dc9427a0136ed7752db488d6 (current diff)
parent 59521 36abf00aa201446dec511eb691e4847d1ca7e348 (diff)
child 59524 a6a3200c19e53743b29edb95a628b061f2f3985a
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersbackout
bugs604885
milestone2.0b9pre
Bug 604885 commit backout merge. a=backout
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -713,25 +713,23 @@
                     if (element.className == "controlBar" && fadeIn && element.hidden)
                         this.scrubber.valueChanged("curpos", this.video.currentTime * 1000, false);
 
                     if (immediate)
                         element.setAttribute("immediate", true);
                     else
                         element.removeAttribute("immediate");
 
-                    // We must force style resolution (by accessing element.clientTop)
-                    // in order to ensure our size changes correctly when the status
-                    // overlay hides and shows.
                     if (fadeIn) {
                         element.setAttribute("hidden", false);
-                        element.clientTop;
+                        // force style resolution, so that transition begins
+                        // when we remove the attribute.
+                        getComputedStyle(element, "").display;
                         element.removeAttribute("fadeout");
                     } else {
-                        element.clientTop;
                         element.setAttribute("fadeout", true);
                     }
                 },
 
                 onTransitionEnd : function (event) {
                     // Ignore events for things other than opacity changes.
                     if (event.propertyName != "opacity")
                         return;