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

Bug 1272521 - Hide Widevine CDM on MacOSX 10.6. r=spohl a=ritu

Browse Source 
The Widevine CDM crashes on MacOSX 10.6, so only download, expose, and install
it on 10.7 and later.

MozReview-Commit-ID: 51iJpQEB1m7
This commit is contained in:
Chris Pearce 2016-05-13 14:02:20 +12:00
parent 8f5ec00b73
commit 07f042c789
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolkit/modules/GMPUtils.jsm
View File

@ -80,10 +80,9 @@ this.GMPUtils = {
} }
} else if (aPlugin.id == WIDEVINE_ID) { } else if (aPlugin.id == WIDEVINE_ID) {
// The Widevine plugin is available for Windows versions Vista and later // The Widevine plugin is available for Windows versions Vista and later
// and Mac // and Mac OSX 10.7 and later.
if ((Services.appinfo.OS == "WINNT" && if (AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
Services.sysinfo.getPropertyAsInt32("version") >= 6) || AppConstants.isPlatformAndVersionAtLeast("macosx", "10.7")) {
Services.appinfo.OS == "Darwin") {
return true; return true;
} }
return false; return false;

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

@ -5,6 +5,7 @@
"use strict"; "use strict";
Cu.import("resource://gre/modules/Promise.jsm"); Cu.import("resource://gre/modules/Promise.jsm");
Cu.import("resource://gre/modules/AppConstants.jsm");
var {AddonTestUtils} = Cu.import("resource://testing-common/AddonManagerTesting.jsm", {}); var {AddonTestUtils} = Cu.import("resource://testing-common/AddonManagerTesting.jsm", {});
var GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm"); var GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm");
@ -387,9 +388,8 @@ add_task(function* testEmeSupport() {
"Adobe EME not supported, couldn't find add-on element."); "Adobe EME not supported, couldn't find add-on element.");
} }
} else if (addon.id == GMPScope.WIDEVINE_ID) { } else if (addon.id == GMPScope.WIDEVINE_ID) {
if ((Services.appinfo.OS == "WINNT" && if (AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
Services.sysinfo.getPropertyAsInt32("version") >= 6) || AppConstants.isPlatformAndVersionAtLeast("macosx", "10.7")) {
Services.appinfo.OS == "Darwin") {
Assert.ok(item, "Widevine supported, found add-on element."); Assert.ok(item, "Widevine supported, found add-on element.");
} else { } else {
Assert.ok(!item, Assert.ok(!item,