Bug 1647225 - Change the string exposed via gfxInfo. r=jrmuizel
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 23 Jun 2020 15:14:24 +0000
changeset 536906 d828dd605e07231c3a298af723438059adc5bdff
parent 536905 4b94433c793744643f82e105a5b85a9ab11c2f49
child 536907 be50615e8f06bbc8886334692f6fbf907a7291d9
push id37533
push userdluca@mozilla.com
push dateTue, 23 Jun 2020 21:38:40 +0000
treeherdermozilla-central@d48aa0f0aa0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1647225
milestone79.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 1647225 - Change the string exposed via gfxInfo. r=jrmuizel This includes things like about:support, gfxCriticalNote, probably telemetry environment stuff. Differential Revision: https://phabricator.services.mozilla.com/D80451
gfx/src/gfxTelemetry.cpp
widget/nsIGfxInfo.idl
widget/windows/GfxInfo.cpp
--- a/gfx/src/gfxTelemetry.cpp
+++ b/gfx/src/gfxTelemetry.cpp
@@ -54,17 +54,17 @@ const char* FeatureStatusToString(Featur
       return "blocked-release-channel-nvidia";
     case FeatureStatus::BlockedReleaseChannelBattery:
       return "blocked-release-channel-battery";
     case FeatureStatus::BlockedReleaseChannelAndroid:
       return "blocked-release-channel-android";
     case FeatureStatus::Denied:
       return "denied";
     case FeatureStatus::Blocklisted:
-      return "blacklisted";
+      return "blocklisted";
     case FeatureStatus::OptIn:
       return "opt-in";
     case FeatureStatus::Failed:
       return "failed";
     case FeatureStatus::Disabled:
       return "disabled";
     case FeatureStatus::Available:
       return "available";
--- a/widget/nsIGfxInfo.idl
+++ b/widget/nsIGfxInfo.idl
@@ -261,17 +261,17 @@ interface nsIGfxInfo : nsISupports
   //     "compositor": "d3d9", "d3d11", "opengl", "basic", or "none"
   //                   // ("none" indicates no compositors have been created)
   //     // Feature is one of "d3d9", "d3d11", "opengl", "basic", or "d2d".
   //     "<feature>": {
   //       // Each backend can have one of the following statuses:
   //       //   "unused"      - This feature has not been requested.
   //       //   "unavailable" - OS version or restriction prevents use.
   //       //   "blocked"     - An internal condition (such as safe mode) prevents use.
-  //       //   "blacklisted" - Blocked due to a blacklist restriction.
+  //       //   "blocklisted" - Blocked due to a blocklist restriction.
   //       //   "denied"      - Blocked due to allowlist restrictions.
   //       //   "disabled"    - User explicitly disabled this default feature.
   //       //   "failed"      - Feature failed to initialize.
   //       //   "available"   - User has this feature available by default.
   //       "status": "<status>",
   //       "version": "<version>",
   //       "warp": true|false,           // D3D11 only.
   //       "textureSharing": true|false, // D3D11 only.
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -2026,17 +2026,17 @@ void GfxInfo::DescribeFeatures(JSContext
       if (SUCCEEDED(
               gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS,
                                         discardFailureId, &status))) {
         blocklisted = (status != nsIGfxInfo::FEATURE_STATUS_OK);
       }
     }
 
     val = JS::BooleanValue(blocklisted);
-    JS_SetProperty(aCx, obj, "blacklisted", val);
+    JS_SetProperty(aCx, obj, "blocklisted", val);
   }
 
   gfx::FeatureState& d2d = gfxConfig::GetFeature(Feature::DIRECT2D);
   if (!InitFeatureObject(aCx, aObj, "d2d", d2d, &obj)) {
     return;
   }
   {
     const char* version = "1.1";