Bug 1018468 - Add fullscreen button to video controls. r=mfinkle

mobile/android/themes/core/jar.mn

@@ -57,6 +57,8 @@ chrome.jar:
   skin/images/dropmarker.svg                (images/dropmarker.svg)
   skin/images/dropmarker-right.svg          (images/dropmarker-right.svg)
   skin/images/errorpage-warning.png         (images/errorpage-warning.png)
+  skin/images/exitfullscreen-hdpi.png       (images/exitfullscreen-hdpi.png)
+  skin/images/fullscreen-hdpi.png           (images/fullscreen-hdpi.png)
   skin/images/certerror-warning.png         (images/certerror-warning.png)
   skin/images/errorpage-larry-white.png     (images/errorpage-larry-white.png)
   skin/images/errorpage-larry-black.png     (images/errorpage-larry-black.png)

mobile/android/themes/core/touchcontrols.css

@@ -8,7 +8,6 @@
 .controlsOverlay {
   -moz-box-pack: center;
   -moz-box-align: end;
-  padding: 20px;
   -moz-box-flex: 1;
   -moz-box-orient: horizontal;
 }
@@ -22,9 +21,7 @@
 .controlBar {
   -moz-box-flex: 1;
   font-size: 16pt;
-  padding: 10px;
   background-color: rgba(50,50,50,0.8);
-  border-radius: 8px;
   width: 100%;
 }
 
@@ -35,7 +32,8 @@
 
 .playButton,
 .castingButton,
-.muteButton {
+.muteButton,
+.fullscreenButton {
   -moz-appearance: none;
   min-height: 42px;
   min-width: 42px;
@@ -43,7 +41,6 @@
 }
 
 .playButton {
-  -moz-transform: translateX(21px);
   background: url("chrome://browser/skin/images/pause-hdpi.png") no-repeat center;
 }
 
@@ -59,6 +56,13 @@
   background: url("chrome://browser/skin/images/cast-active-hdpi.png") no-repeat center;
 }
 
+/* If the casting button is showing, there will be two buttons on the right side of the controls.
+ * This shifts the play button to be centered.
+ */
+.castingButton:not([hidden="true"]) + .fullscreenButton + spacer + .playButton {
+  transform: translateX(-21px);
+}
+
 .muteButton {
   background: url("chrome://browser/skin/images/mute-hdpi.png") no-repeat center;
 }
@@ -67,9 +71,13 @@
   background: url("chrome://browser/skin/images/unmute-hdpi.png") no-repeat center;
 }
 
-/* This button is hidden until bug 704229 is fixed. */
 .fullscreenButton {
-  display: none;
+  background-color: transparent;
+  background: url("chrome://browser/skin/images/fullscreen-hdpi.png") no-repeat center;
+}
+
+.fullscreenButton[fullscreened] {
+  background: url("chrome://browser/skin/images/exitfullscreen-hdpi.png") no-repeat center;
 }
 
 /* bars */

toolkit/content/tests/widgets/test_videocontrols_standalone.html

@@ -68,7 +68,7 @@ function runTestAudioPre() {
 function runTestAudio(aAudio) {
   info("User agent (help diagnose bug #943556): " + navigator.userAgent);
   var isAndroid = navigator.userAgent.contains("Android");
-  var expectedHeight = isAndroid ? 123 : 28;
+  var expectedHeight = isAndroid ? 103 : 28;
   var condition = function () {
     var boundingRect = aAudio.getBoundingClientRect();
     return boundingRect.height == expectedHeight;