wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1690 - Part 2: Update MacOS Blocklist support from 10.13 to 11.0.

Browse source 
Changes based on Mozilla bug 1678061.
This commit is contained in:
Brian Smith 2020-12-01 15:46:38 -06:00 • committed by roytam1
commit 0ccf8dfa99
3 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
widget/GfxDriverInfo.h
View file

@ -58,6 +58,11 @@ enum class OperatingSystem {
OSX10_10, OSX10_10,
OSX10_11, OSX10_11,
OSX10_12, OSX10_12,
OSX10_13,
OSX10_14,
OSX10_15,
OSX10_16,
OSX11_0,
Ios Ios
}; };

8
widget/GfxInfoBase.cpp
View file

@ -280,6 +280,14 @@ BlacklistOSToOperatingSystem(const nsAString& os)
return OperatingSystem::OSX10_11; return OperatingSystem::OSX10_11;
else if (os.EqualsLiteral("Darwin 16")) else if (os.EqualsLiteral("Darwin 16"))
return OperatingSystem::OSX10_12; return OperatingSystem::OSX10_12;
else if (os.EqualsLiteral("Darwin 17"))
return OperatingSystem::OSX10_13;
else if (os.EqualsLiteral("Darwin 18"))
return OperatingSystem::OSX10_14;
else if (os.EqualsLiteral("Darwin 19"))
return OperatingSystem::OSX10_15;
else if (os.EqualsLiteral("Darwin 20"))
return OperatingSystem::OSX11_0;
// For historical reasons, "All" in blocklist means "All Windows" // For historical reasons, "All" in blocklist means "All Windows"
else if (os.EqualsLiteral("All")) else if (os.EqualsLiteral("All"))
return OperatingSystem::Windows; return OperatingSystem::Windows;

61
widget/cocoa/GfxInfo.mm
View file

@ -30,25 +30,46 @@ GfxInfo::GfxInfo()
} }
static OperatingSystem static OperatingSystem
OSXVersionToOperatingSystem(uint32_t aOSXVersion) OSXVersionToOperatingSystem(uint32_t aOSXVersion) {
{ switch (nsCocoaFeatures::ExtractMajorVersion(aOSXVersion)) {
if (nsCocoaFeatures::ExtractMajorVersion(aOSXVersion) == 10) { case 10:
switch (nsCocoaFeatures::ExtractMinorVersion(aOSXVersion)) { switch (nsCocoaFeatures::ExtractMinorVersion(aOSXVersion)) {
case 6: case 6:
return OperatingSystem::OSX10_6; return OperatingSystem::OSX10_6;
case 7: case 7:
return OperatingSystem::OSX10_7; return OperatingSystem::OSX10_7;
case 8: case 8:
return OperatingSystem::OSX10_8; return OperatingSystem::OSX10_8;
case 9: case 9:
return OperatingSystem::OSX10_9; return OperatingSystem::OSX10_9;
case 10: case 10:
return OperatingSystem::OSX10_10; return OperatingSystem::OSX10_10;
case 11: case 11:
return OperatingSystem::OSX10_11; return OperatingSystem::OSX10_11;
case 12: case 12:
return OperatingSystem::OSX10_12; return OperatingSystem::OSX10_12;
} case 13:
return OperatingSystem::OSX10_13;
case 14:
return OperatingSystem::OSX10_14;
case 15:
return OperatingSystem::OSX10_15;
case 16:
// Depending on the SDK version, we either get 10.16 or 11.0.
// Normalize this to 11.0.
return OperatingSystem::OSX11_0;
default:
break;
}
break;
case 11:
switch (nsCocoaFeatures::ExtractMinorVersion(aOSXVersion)) {
case 0:
return OperatingSystem::OSX11_0;
default:
break;
}
break;
} }
return OperatingSystem::Unknown; return OperatingSystem::Unknown;
@ -107,7 +128,7 @@ GfxInfo::Init()
AddCrashReportAnnotations(); AddCrashReportAnnotations();
mOSXVersion = nsCocoaFeatures::OSXVersion(); mOSXVersion = nsCocoaFeatures::macOSVersion();
return rv; return rv;
} }