Bug 1624858 - Fix graphics blocklist not recent Windows 10 comparison check. r=jrmuizel
authorAndrew Osmond <aosmond@mozilla.com>
Wed, 25 Mar 2020 14:12:56 +0000
changeset 520408 f498ba0dcc35173c88979d634f002c94566fe061
parent 520407 17fe4ba9ed5af0b38819a40ee73231d2d4cea847
child 520409 3511585046a4cec50ee96bfc76ed683851b4367b
push id37249
push userdvarga@mozilla.com
push dateWed, 25 Mar 2020 21:39:06 +0000
treeherdermozilla-central@b3c3f7d0f044 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1624858
milestone76.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1624858 - Fix graphics blocklist not recent Windows 10 comparison check. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D68200
widget/GfxInfoBase.cpp
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -760,17 +760,17 @@ inline bool MatchingOperatingSystems(Ope
 
 #if defined(XP_WIN)
   if (aBlockedOS == OperatingSystem::Windows) {
     // We do want even "unknown" aSystemOS to fall under "all windows"
     return true;
   }
 
   constexpr uint32_t kMinWin10BuildNumber = 18362;
-  if (aSystemOSBuild && aBlockedOS == OperatingSystem::RecentWindows10 &&
+  if (aBlockedOS == OperatingSystem::RecentWindows10 &&
       aSystemOS == OperatingSystem::Windows10) {
     // For allowlist purposes, we sometimes want to restrict to only recent
     // versions of Windows 10. This is a bit of a kludge but easier than adding
     // complicated blocklist infrastructure for build ID comparisons like driver
     // versions.
     return aSystemOSBuild >= kMinWin10BuildNumber;
   }
 
@@ -852,18 +852,17 @@ int32_t GfxInfoBase::FindBlocklistedDevi
   }
 
   bool hasBattery = false;
   rv = GetHasBattery(&hasBattery);
   if (NS_FAILED(rv) && rv != NS_ERROR_NOT_IMPLEMENTED) {
     return 0;
   }
 
-  // OS build number is only used for the allowlist.
-  uint32_t osBuild = aForAllowing ? OperatingSystemBuild() : 0;
+  uint32_t osBuild = OperatingSystemBuild();
 
   // Get the adapters once then reuse below
   nsAutoString adapterVendorID[2];
   nsAutoString adapterDeviceID[2];
   nsAutoString adapterDriverVendor[2];
   nsAutoString adapterDriverVersionString[2];
   bool adapterInfoFailed[2];