Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1234099 - Backout 34460cc654ca due to playback failures caused by Adobe GMP. r=backout

Browse Source
This commit is contained in:
Chris Pearce 2016-01-07 09:57:36 +13:00
parent 586c6f4bb9
commit 5d3656a01c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/modules/GMPUtils.jsm
View File

@ -81,6 +81,14 @@ this.GMPUtils = {
return false;
}
if (Services.sysinfo.getPropertyAsInt32("version") < 6) {
// Windows versions before Vista are unsupported.
this.maybeReportTelemetry(aPlugin.id,
"VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
GMPPluginUnsupportedReason.WINDOWS_VERSION);
return false;
}
return true;
},

3
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
View File

@ -378,7 +378,8 @@ add_task(function* testEmeSupport() {
let doc = gManagerWindow.document;
let item = get_addon_element(gManagerWindow, addon.id);
if (addon.id == GMPScope.EME_ADOBE_ID) {
if (Services.appinfo.OS == "WINNT") {
if (Services.appinfo.OS == "WINNT" &&
Services.sysinfo.getPropertyAsInt32("version") >= 6) {
Assert.ok(item, "Adobe EME supported, found add-on element.");
} else {
Assert.ok(!item,