From ed3e0d6f725e8c0ad9b24ccd895a97a2350fd209 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Tue, 23 Jun 2020 15:14:24 +0000 Subject: [PATCH] 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 | 2 +- widget/nsIGfxInfo.idl | 2 +- widget/windows/GfxInfo.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/src/gfxTelemetry.cpp b/gfx/src/gfxTelemetry.cpp index ecda55c2d68d..f9edafe9225e 100644 --- a/gfx/src/gfxTelemetry.cpp +++ b/gfx/src/gfxTelemetry.cpp @@ -59,7 +59,7 @@ const char* FeatureStatusToString(FeatureStatus aStatus) { case FeatureStatus::Denied: return "denied"; case FeatureStatus::Blocklisted: - return "blacklisted"; + return "blocklisted"; case FeatureStatus::OptIn: return "opt-in"; case FeatureStatus::Failed: diff --git a/widget/nsIGfxInfo.idl b/widget/nsIGfxInfo.idl index 49c8fca1a42f..09fede49d8ed 100644 --- a/widget/nsIGfxInfo.idl +++ b/widget/nsIGfxInfo.idl @@ -266,7 +266,7 @@ interface nsIGfxInfo : nsISupports // // "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. diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 937526fcca94..ea65b2e60d60 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -2031,7 +2031,7 @@ void GfxInfo::DescribeFeatures(JSContext* aCx, JS::Handle aObj) { } val = JS::BooleanValue(blocklisted); - JS_SetProperty(aCx, obj, "blacklisted", val); + JS_SetProperty(aCx, obj, "blocklisted", val); } gfx::FeatureState& d2d = gfxConfig::GetFeature(Feature::DIRECT2D);