wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out the videocontrols piece of bug 1231828 due to b2g breakage and add to the ignore list. r=backout

Browse Source
This commit is contained in:
Dave Townsend 2015-12-16 12:45:58 -08:00
parent 5ccab60765
commit 327f490f7f
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -195,6 +195,7 @@ toolkit/components/places/**
# Uses preprocessing
toolkit/content/contentAreaUtils.js
toolkit/content/widgets/videocontrols.xml
toolkit/components/jsdownloads/src/DownloadIntegration.jsm
toolkit/components/search/nsSearchService.js
toolkit/components/url-classifier/**

42
toolkit/content/widgets/videocontrols.xml
View File

@ -794,18 +794,16 @@
},
seekToPosition : function(newPosition) {
let { AppConstants } =
Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
newPosition /= 1000; // convert from ms
this.log("+++ seeking to " + newPosition);
if (AppConstants.platform == "gonk") {
// 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;
}
#ifdef MOZ_WIDGET_GONK
// 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;
#endif
},
setVolume : function(newVolume) {
@ -1254,24 +1252,22 @@
if (!this.video.hasAttribute("controls"))
return;
let { AppConstants } =
Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
var keystroke = "";
if (event.altKey)
keystroke += "alt-";
if (event.shiftKey)
keystroke += "shift-";
if (AppConstants.platform == "macosx") {
if (event.metaKey)
keystroke += "accel-";
if (event.ctrlKey)
keystroke += "control-";
} else {
if (event.metaKey)
keystroke += "meta-";
if (event.ctrlKey)
keystroke += "accel-";
}
#ifdef XP_MACOSX
if (event.metaKey)
keystroke += "accel-";
if (event.ctrlKey)
keystroke += "control-";
#else
if (event.metaKey)
keystroke += "meta-";
if (event.ctrlKey)
keystroke += "accel-";
#endif
switch (event.keyCode) {
case KeyEvent.DOM_VK_UP: