Bug 898940 - Show the controls bar for all non-dynamic controls. r=jaws, a=bajaj
authorRobert O'Callahan <robert@ocallahan.org>
Thu, 01 Aug 2013 16:04:16 +1200
changeset 153688 d8ead6f0325cc67e875b7b7b81819e2b404fa3f5
parent 153687 bd6b0a3cf6c76d87a6e59580a57dd4f39c6c744d
child 153689 cbe6bd1058f2d084ab1ac125df7a2cd0258d9394
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, bajaj
bugs898940
milestone25.0a2
Bug 898940 - Show the controls bar for all non-dynamic controls. r=jaws, a=bajaj
toolkit/content/widgets/videocontrols.xml
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -474,19 +474,19 @@
                     // the controls are broken and we don't want them shown. But if script is
                     // enabled, the code here will run and can explicitly unhide the controls.
                     //
                     // For videos with |autoplay| set, we'll leave the controls initially hidden,
                     // so that they don't get in the way of the playing video. Otherwise we'll
                     // go ahead and reveal the controls now, so they're an obvious user cue.
                     //
                     // (Note: the |controls| attribute is already handled via layout/style/html.css)
-                    var shouldShow = this.video.paused &&
-                       (!(this.video.autoplay && this.video.mozAutoplayEnabled) ||
-                        !this.dynamicControls);
+                    var shouldShow = !this.dynamicControls ||
+                      (this.video.paused &&
+                       !(this.video.autoplay && this.video.mozAutoplayEnabled));
                     // Hide the overlay if the video time is non-zero or if an error occurred to workaround bug 718107.
                     this.startFade(this.clickToPlay, shouldShow && !this.isAudioOnly &&
                                    this.video.currentTime == 0 && !this.hasError(), true);
                     this.startFade(this.controlBar, shouldShow, true);
                 },
 
                 handleCustomEvents : function (e) {
                     if (!e.isTrusted)