Bug 1326445 - Remove Gonk specific video controls. r=jaws
MozReview-Commit-ID: 75Ui045M21V
--- 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">