Bug 1326445 - Remove Gonk specific video controls. r=jaws
authorJ. Ryan Stinnett <jryans@gmail.com>
Fri, 30 Dec 2016 12:18:44 -0600
changeset 327857 73a646d78cdc2a21e92e2979dbb58b7f88dd7298
parent 327856 64da0e9bc05b8cff8993e6ac628d3207ac83ca91
child 327858 06698dfb37848558b9edaa6fb947bab0259fa3d9
push id85304
push userphilringnalda@gmail.com
push dateWed, 04 Jan 2017 02:47:06 +0000
treeherdermozilla-inbound@6176579defcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1326445
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1326445 - Remove Gonk specific video controls. r=jaws MozReview-Commit-ID: 75Ui045M21V
b2g/chrome/content/content.css
toolkit/content/widgets/videocontrols.xml
--- a/b2g/chrome/content/content.css
+++ b/b2g/chrome/content/content.css
@@ -90,17 +90,17 @@ xul|thumb {
 
 xul|scrollbarbutton {
   background-image: none !important;
 }
 
 %ifndef MOZ_GRAPHENE
 /* -moz-touch-enabled? media elements */
 :-moz-any(video, audio) > xul|videocontrols {
-  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControlsGonk");
+  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
 }
 
 select:not([size]):not([multiple]) > xul|scrollbar,
 select[size="1"] > xul|scrollbar,
 select:not([size]):not([multiple]) xul|scrollbarbutton,
 select[size="1"] xul|scrollbarbutton {
   display: block;
   margin-left: 0;
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -855,24 +855,17 @@
         } else {
           this.progressBar.value = 0;
         }
       },
 
       seekToPosition(newPosition) {
         newPosition /= 1000; // convert from ms
         this.log("+++ seeking to " + newPosition);
-        if (this.videocontrols.isGonk) {
-          // We use fastSeek() on B2G, and an accurate (but slower)
-          // seek on other platforms (that are likely to be higher
-          // perf).
-          this.video.fastSeek(newPosition);
-        } else {
-          this.video.currentTime = newPosition;
-        }
+        this.video.currentTime = newPosition;
       },
 
       setVolume(newVolume) {
         this.log("*** setting volume to " + newVolume);
         this.video.volume = newVolume;
         this.video.muted = false;
       },
 
@@ -2045,24 +2038,16 @@
         }
         this.TouchUtils.toggleControls();
       }
     </handler>
   </handlers>
 
 </binding>
 
-<binding id="touchControlsGonk" extends="chrome://global/content/bindings/videocontrols.xml#touchControls">
-  <implementation>
-    <constructor>
-      this.isGonk = true;
-    </constructor>
-  </implementation>
-</binding>
-
 <binding id="noControls">
 
   <resources>
     <stylesheet src="chrome://global/content/bindings/videocontrols.css"/>
     <stylesheet src="chrome://global/skin/media/videocontrols.css"/>
   </resources>
 
   <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="mediaControlsFrame">