Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout 0e6aa605af74 (bug 1140263) now that Adobe EME is cleared to be turned on for Windows Vista and above. r=me

Browse Source
This commit is contained in:
Stephen Pohl 2015-03-22 23:26:26 -04:00
parent 2f60231832
commit 148f6e4649
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/modules/GMPUtils.jsm
View File

@ -47,7 +47,11 @@ this.GMPUtils = {
*/
_isPluginSupported: function(aPlugin) {
if (aPlugin.id == EME_ADOBE_ID) {
return false;
if (Services.appinfo.OS == "WINNT") {
return Services.sysinfo.getPropertyAsInt32("version") >= 6;
} else {
return false;
}
}
return true;
},

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

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