From 8aa3164d53d65f835dc149532a26c7efcd9147f0 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 22 Sep 2011 16:19:52 -0700
Subject: [PATCH 1/2] Bug 462117 - Reducing the number of visible controls when
 the video is too small. r=dolske

---
 toolkit/content/widgets/videocontrols.css | 15 ++++++++
 toolkit/content/widgets/videocontrols.xml | 45 ++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/videocontrols.css b/toolkit/content/widgets/videocontrols.css
index b3ef938fb82..3be9c0dfb26 100644
--- a/toolkit/content/widgets/videocontrols.css
+++ b/toolkit/content/widgets/videocontrols.css
@@ -53,3 +53,18 @@
 .statusOverlay[fadeout] {
   opacity: 0;
 }
+
+.controlBar[size="hidden"],
+.controlBar[size="small"] .durationBox,
+.controlBar[size="small"] .durationLabel,
+.controlBar[size="small"] .positionLabel {
+  visibility: collapse;
+}
+
+.controlBar[size="small"] .scrubberStack {
+  visibility: hidden;
+}
+
+.controlBar[size="small"] .scrubberStack > * {
+  visibility: hidden;
+}
diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index cbbb04ce169..df328670ced 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -343,6 +343,17 @@
                         this.statusIcon.setAttribute("type", "throbber");
                         this.setupStatusFader();
                     }
+
+                    // An event handler for |onresize| should be added when bug 227495 is fixed.
+                    let controlBarWasHidden = this.controlBar.getAttribute("hidden") == "true";
+                    this.controlBar.removeAttribute("hidden");
+                    this._playButtonWidth = this.playButton.clientWidth;
+                    this._durationLabelWidth = this.durationLabel.clientWidth;
+                    this._muteButtonWidth = this.muteButton.clientWidth;
+                    this._controlBarHeight = this.controlBar.clientHeight;
+                    if (controlBarWasHidden)
+                      this.controlBar.setAttribute("hidden", "true");
+                    this.adjustControlSize();
                 },
 
                 get dynamicControls() {
@@ -400,6 +411,7 @@
                             this.volumeControl.value = volume;
                             break;
                         case "loadedmetadata":
+                            this.adjustControlSize();
                             // If a <video> doesn't have any video data, treat it as <audio>
                             // and show the controls (they won't fade back out)
                             if (this.video instanceof HTMLVideoElement &&
@@ -654,6 +666,9 @@
                         !(this.video.autoplay && this.video.mozAutoplayEnabled))
                         return;
 
+                    if (!isMouseOver)
+                        this.adjustControlSize();
+
                     this.startFade(this.controlBar, isMouseOver);
                 },
 
@@ -861,6 +876,34 @@
                         dump("videoctl: " + msg + "\n");
                 },
 
+                _playButtonWidth : 0,
+                _durationLabelWidth : 0,
+                _muteButtonWidth : 0,
+                _controlBarHeight : 0,
+                adjustControlSize : function adjustControlSize() {
+                    let videoHeight = this.video.clientHeight;
+                    let videoWidth = this.video.clientWidth;
+
+                    // The scrubber has |flex=1|, therefore |minScrubberWidth|
+                    // was generated by empirical testing.
+                    let minScrubberWidth = 25;
+                    let minWidthAllControls = this._playButtonWidth +
+                                              minScrubberWidth +
+                                              this._durationLabelWidth +
+                                              this._muteButtonWidth;
+                    let minHeightForControlBar = this._controlBarHeight;
+                    let minWidthOnlyPlayPause = this._playButtonWidth + this._muteButtonWidth;
+
+                    let size = "normal";
+                    if (videoHeight < minHeightForControlBar)
+                        size = "hidden";
+                    else if (videoWidth < minWidthOnlyPlayPause)
+                        size = "hidden";
+                    else if (videoWidth < minWidthAllControls)
+                        size = "small";
+                    this.controlBar.setAttribute("size", size);
+                },
+
                 init : function (binding) {
                     this.video = binding.parentNode;
                     this.videocontrols = binding;
@@ -879,7 +922,7 @@
                     this.durationLabel = document.getAnonymousElementByAttribute(binding, "class", "durationLabel");
                     this.positionLabel = document.getAnonymousElementByAttribute(binding, "class", "positionLabel");
                     this.statusOverlay = document.getAnonymousElementByAttribute(binding, "class", "statusOverlay");
-                    this.controlsSpacer = document.getAnonymousElementByAttribute(binding, "class", "controlsSpacer")
+                    this.controlsSpacer = document.getAnonymousElementByAttribute(binding, "class", "controlsSpacer");
 
                     this.setupInitialState();
 

From 2047df91dfde4d6f93805699313760846ef9bb5a Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Fri, 23 Sep 2011 22:22:51 +1200
Subject: [PATCH 2/2] Backed out changeset 49678dad20f0 due to test failure

---
 toolkit/content/widgets/videocontrols.css | 15 --------
 toolkit/content/widgets/videocontrols.xml | 45 +----------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/toolkit/content/widgets/videocontrols.css b/toolkit/content/widgets/videocontrols.css
index 3be9c0dfb26..b3ef938fb82 100644
--- a/toolkit/content/widgets/videocontrols.css
+++ b/toolkit/content/widgets/videocontrols.css
@@ -53,18 +53,3 @@
 .statusOverlay[fadeout] {
   opacity: 0;
 }
-
-.controlBar[size="hidden"],
-.controlBar[size="small"] .durationBox,
-.controlBar[size="small"] .durationLabel,
-.controlBar[size="small"] .positionLabel {
-  visibility: collapse;
-}
-
-.controlBar[size="small"] .scrubberStack {
-  visibility: hidden;
-}
-
-.controlBar[size="small"] .scrubberStack > * {
-  visibility: hidden;
-}
diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index df328670ced..cbbb04ce169 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -343,17 +343,6 @@
                         this.statusIcon.setAttribute("type", "throbber");
                         this.setupStatusFader();
                     }
-
-                    // An event handler for |onresize| should be added when bug 227495 is fixed.
-                    let controlBarWasHidden = this.controlBar.getAttribute("hidden") == "true";
-                    this.controlBar.removeAttribute("hidden");
-                    this._playButtonWidth = this.playButton.clientWidth;
-                    this._durationLabelWidth = this.durationLabel.clientWidth;
-                    this._muteButtonWidth = this.muteButton.clientWidth;
-                    this._controlBarHeight = this.controlBar.clientHeight;
-                    if (controlBarWasHidden)
-                      this.controlBar.setAttribute("hidden", "true");
-                    this.adjustControlSize();
                 },
 
                 get dynamicControls() {
@@ -411,7 +400,6 @@
                             this.volumeControl.value = volume;
                             break;
                         case "loadedmetadata":
-                            this.adjustControlSize();
                             // If a <video> doesn't have any video data, treat it as <audio>
                             // and show the controls (they won't fade back out)
                             if (this.video instanceof HTMLVideoElement &&
@@ -666,9 +654,6 @@
                         !(this.video.autoplay && this.video.mozAutoplayEnabled))
                         return;
 
-                    if (!isMouseOver)
-                        this.adjustControlSize();
-
                     this.startFade(this.controlBar, isMouseOver);
                 },
 
@@ -876,34 +861,6 @@
                         dump("videoctl: " + msg + "\n");
                 },
 
-                _playButtonWidth : 0,
-                _durationLabelWidth : 0,
-                _muteButtonWidth : 0,
-                _controlBarHeight : 0,
-                adjustControlSize : function adjustControlSize() {
-                    let videoHeight = this.video.clientHeight;
-                    let videoWidth = this.video.clientWidth;
-
-                    // The scrubber has |flex=1|, therefore |minScrubberWidth|
-                    // was generated by empirical testing.
-                    let minScrubberWidth = 25;
-                    let minWidthAllControls = this._playButtonWidth +
-                                              minScrubberWidth +
-                                              this._durationLabelWidth +
-                                              this._muteButtonWidth;
-                    let minHeightForControlBar = this._controlBarHeight;
-                    let minWidthOnlyPlayPause = this._playButtonWidth + this._muteButtonWidth;
-
-                    let size = "normal";
-                    if (videoHeight < minHeightForControlBar)
-                        size = "hidden";
-                    else if (videoWidth < minWidthOnlyPlayPause)
-                        size = "hidden";
-                    else if (videoWidth < minWidthAllControls)
-                        size = "small";
-                    this.controlBar.setAttribute("size", size);
-                },
-
                 init : function (binding) {
                     this.video = binding.parentNode;
                     this.videocontrols = binding;
@@ -922,7 +879,7 @@
                     this.durationLabel = document.getAnonymousElementByAttribute(binding, "class", "durationLabel");
                     this.positionLabel = document.getAnonymousElementByAttribute(binding, "class", "positionLabel");
                     this.statusOverlay = document.getAnonymousElementByAttribute(binding, "class", "statusOverlay");
-                    this.controlsSpacer = document.getAnonymousElementByAttribute(binding, "class", "controlsSpacer");
+                    this.controlsSpacer = document.getAnonymousElementByAttribute(binding, "class", "controlsSpacer")
 
                     this.setupInitialState();