From a07b3884650f07d636b8ba3babb9e56f8414040e Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 21 Feb 2012 15:53:21 -0800
Subject: [PATCH] Bug 727817 - Add hidden click to play button for mobile video
 controls. r=mfinkle,dolske

---
 mobile/android/themes/core/content.css             | 2 +-
 mobile/android/themes/core/gingerbread/content.css | 2 +-
 mobile/android/themes/core/touchcontrols.css       | 7 +++++--
 mobile/xul/themes/core/content.css                 | 2 +-
 mobile/xul/themes/core/gingerbread/content.css     | 2 +-
 toolkit/content/widgets/videocontrols.xml          | 3 +++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mobile/android/themes/core/content.css b/mobile/android/themes/core/content.css
index 24e4b663ac9..759ef9d33ca 100644
--- a/mobile/android/themes/core/content.css
+++ b/mobile/android/themes/core/content.css
@@ -122,7 +122,7 @@ xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
   display: none;
 }
 
-xul|thumb {
+xul|scrollbar xul|thumb {
   background-color: rgba(0, 0, 0, 0.4) !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
diff --git a/mobile/android/themes/core/gingerbread/content.css b/mobile/android/themes/core/gingerbread/content.css
index 51663a8f851..6ba08829abb 100644
--- a/mobile/android/themes/core/gingerbread/content.css
+++ b/mobile/android/themes/core/gingerbread/content.css
@@ -127,7 +127,7 @@ xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
   display: none;
 }
 
-xul|thumb {
+xul|scrollbar xul|thumb {
   background-color: @color_background_scroller@ !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
diff --git a/mobile/android/themes/core/touchcontrols.css b/mobile/android/themes/core/touchcontrols.css
index 96780e0fe12..77f1e73d40a 100644
--- a/mobile/android/themes/core/touchcontrols.css
+++ b/mobile/android/themes/core/touchcontrols.css
@@ -13,7 +13,7 @@
   -moz-box-flex: 1;
   font-size: 16pt;
   padding: 10px;
-  background-color: #34353a;
+  background-color: rgba(50,50,50,0.8);
   border-radius: 8px;
   width: 100%;
 }
@@ -82,7 +82,7 @@
 
 .bufferBar,
 .progressBar {
-  margin: 9px 0px 11px 0px;
+  margin: 11px 0px 9px 0px;
   height: 8px
 }
 
@@ -101,7 +101,10 @@
 
 .scrubber .scale-thumb {
   display: -moz-box;
+  margin: 0px !important;
+  padding: 0px !important;
   background: url("chrome://browser/skin/images/scrubber-hdpi.png") no-repeat;
+  background-size: 32px 32px;
   height: 32px;
   width: 32px;
 }
diff --git a/mobile/xul/themes/core/content.css b/mobile/xul/themes/core/content.css
index 1ad003dd462..003aac8233d 100644
--- a/mobile/xul/themes/core/content.css
+++ b/mobile/xul/themes/core/content.css
@@ -122,7 +122,7 @@ xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
   display: none;
 }
 
-xul|thumb {
+xul|scrollbar xul|thumb {
   background-color: rgba(0, 0, 0, 0.4) !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
diff --git a/mobile/xul/themes/core/gingerbread/content.css b/mobile/xul/themes/core/gingerbread/content.css
index a1e4083d5aa..bfc539e6fc9 100644
--- a/mobile/xul/themes/core/gingerbread/content.css
+++ b/mobile/xul/themes/core/gingerbread/content.css
@@ -127,7 +127,7 @@ xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
   display: none;
 }
 
-xul|thumb {
+xul|scrollbar xul|thumb {
   background-color: @color_background_scroller@ !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index e5713e17f8a..105353011e2 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -1407,6 +1407,9 @@
 
             <vbox class="controlsOverlay">
                 <spacer class="controlsSpacer" flex="1"/>
+                <box flex="1" hidden="true">
+                    <box class="clickToPlay" hidden="true" flex="1"/>
+                </box>
                 <vbox class="controlBar" hidden="true">
                     <hbox class="buttonsBar">
                         <spacer flex="1"/>