From 3a3eec7d3d3e3ad0b48441fc3e81f48ea78e3866 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 22 Nov 2013 00:27:00 -0500
Subject: [PATCH] Backed out changeset b2a0444bc991 (bug 937429)

---
 toolkit/content/tests/widgets/Makefile.in     |  5 +-
 .../test_videocontrols_standalone.html        | 58 -------------------
 toolkit/content/widgets/videocontrols.xml     |  9 +--
 3 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 toolkit/content/tests/widgets/test_videocontrols_standalone.html
diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in
index 6ab3ac330e01..df54378f3dc1 100644
--- a/toolkit/content/tests/widgets/Makefile.in
+++ b/toolkit/content/tests/widgets/Makefile.in
@@ -5,13 +5,12 @@
 
 MOCHITEST_FILES =	\
 		tree_shared.js \
-		test_audiocontrols_dimensions.html \
 		test_mousecapture_area.html \
 		test_videocontrols.html \
 		test_videocontrols_audio.html \
-		test_videocontrols_audio_direction.html \
-		test_videocontrols_standalone.html \
 		test_videocontrols_video_direction.html \
+		test_videocontrols_audio_direction.html \
+		test_audiocontrols_dimensions.html \
 		videocontrols_direction-1-ref.html \
 		videocontrols_direction-1a.html \
 		videocontrols_direction-1b.html \
diff --git a/toolkit/content/tests/widgets/test_videocontrols_standalone.html b/toolkit/content/tests/widgets/test_videocontrols_standalone.html
deleted file mode 100644
index b61f49d685b6..000000000000
--- a/toolkit/content/tests/widgets/test_videocontrols_standalone.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Video controls test</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<p id="display"></p>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-const videoWidth = 320;
-const videoHeight = 240;
-
-function getMediaElement(aWindow) {
-  return aWindow.document.getElementsByTagName("video")[0];
-}
-
-var popup = window.open("seek_with_sound.ogg");
-popup.addEventListener("loadedmetadata", function onLoadedMetaData() {
-  popup.removeEventListener("loadedmetadata", onLoadedMetaData);
-  var video = getMediaElement(popup);
-  runTestVideo(video);
-});
-
-function runTestVideo(aVideo) {
-  var boundingRect = aVideo.getBoundingClientRect();
-  is(boundingRect.width, videoWidth, "Width of the video should match expectation");
-  is(boundingRect.height, videoHeight, "Height of video should match expectation");
-  popup.close();
-  runTestAudioPre();
-}
-
-function runTestAudioPre() {
-  popup = window.open("audio.ogg");
-  popup.addEventListener("loadedmetadata", function onLoadedMetaData() {
-    popup.removeEventListener("loadedmetadata", onLoadedMetaData);
-    var audio = getMediaElement(popup);
-    runTestAudio(audio);
-  });
-}
-
-function runTestAudio(aAudio) {
-  var boundingRect = aAudio.getBoundingClientRect();
-  is(boundingRect.height, 28, "Height of audio element should be 28, which is equal to the controls bar.");
-  popup.close();
-  SimpleTest.finish();
-}
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index 48bf1fa34410..27f6be83d793 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -344,13 +344,8 @@
                     this._isAudioOnly = val;
                     if (!this.isTopLevelSyntheticDocument)
                         return;
-                    if (this._isAudioOnly) {
-                        this.video.style.height = this._controlBarHeight + "px";
-                        this.video.style.width = "66%";
-                    } else {
-                        this.video.style.removeProperty("height");
-                        this.video.style.removeProperty("width");
-                    }
+                    this.video.style.height = this._controlBarHeight + "px";
+                    this.video.style.width = "66%";
                 },
                 suppressError : false,
 
