//content/browser/gpu/: use more intentional terms.

Use "blocklist" for the concept of block certain GPU features based on
the system's configuration.

Bug: chromium:1101491
Change-Id: Idaeee39cb167705bb89327e70577eb3c7ca73dec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302151Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792018}

content/browser/gpu/gpu_data_manager_impl.h

@@ -96,7 +96,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
   void OnBrowserThreadsStarted();
   void TerminateInfoCollectionGpuProcess();
 #endif
-  // Update the GPU feature info. This updates the blacklist and enabled status
+  // Update the GPU feature info. This updates the blocklist and enabled status
   // of GPU rasterization. In the future this will be used for more features.
   void UpdateGpuFeatureInfo(const gpu::GpuFeatureInfo& gpu_feature_info,
                             const base::Optional<gpu::GpuFeatureInfo>&
@@ -117,7 +117,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
   // software compositing.
   void SetGpuCompositingDisabled();
 
-  // Update GpuPreferences based on blacklisting decisions.
+  // Update GpuPreferences based on blocklisting decisions.
   void UpdateGpuPreferences(gpu::GpuPreferences* gpu_preferences,
                             GpuProcessKind kind) const;
 

content/browser/gpu/gpu_data_manager_impl_private.h

@@ -148,7 +148,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
 
   // Indicates the reason that access to a given client API (like
   // WebGL or Pepper 3D) was blocked or not. This state is distinct
-  // from blacklisting of an entire feature.
+  // from blocklisting of an entire feature.
   enum class DomainBlockStatus {
     kBlocked,
     kAllDomainsBlocked,

content/browser/gpu/gpu_data_manager_testing.json

@@ -4,14 +4,14 @@
   "entries": [
     {
       "id": 1,
-      "description": "GpuDataManagerImplPrivateTest.GpuSideBlacklisting.0",
+      "description": "GpuDataManagerImplPrivateTest.GpuSideBlocklisting.0",
       "features": [
         "accelerated_webgl"
       ]
     },
     {
       "id": 2,
-      "description": "GpuDataManagerImplPrivateTest.GpuSideBlacklisting.1",
+      "description": "GpuDataManagerImplPrivateTest.GpuSideBlocklisting.1",
       "gl_renderer": ".*GeForce.*",
       "features": [
         "accelerated_2d_canvas"
@@ -19,14 +19,14 @@
     },
     {
       "id": 3,
-      "description": "GpuDataManagerImplPrivateTest.GpuSideBlacklistingWebGL.0",
+      "description": "GpuDataManagerImplPrivateTest.GpuSideBlocklistingWebGL.0",
       "features": [
         "accelerated_2d_canvas"
       ]
     },
     {
       "id": 4,
-      "description": "GpuDataManagerImplPrivateTest.GpuSideBlacklistingWebGL.1",
+      "description": "GpuDataManagerImplPrivateTest.GpuSideBlocklistingWebGL.1",
       "gl_renderer": ".*GeForce.*",
       "features": [
         "accelerated_webgl",
@@ -47,7 +47,7 @@
     },
     {
       "id": 6,
-      "description": "GpuDataManagerImplPrivateTest.BlacklistAllFeatures",
+      "description": "GpuDataManagerImplPrivateTest.BlocklistAllFeatures",
       "features": [
         "all"
       ]

content/browser/gpu/gpu_data_manager_testing_autogen.cc

@@ -18,7 +18,7 @@ namespace gpu {
 const GpuControlList::Entry kGpuDataManagerTestingEntries[] = {
     {
         1,  // id
-        "GpuDataManagerImplPrivateTest.GpuSideBlacklisting.0",
+        "GpuDataManagerImplPrivateTest.GpuSideBlocklisting.0",
         base::size(kFeatureListForGpuManagerTestingEntry1),  // features size
         kFeatureListForGpuManagerTestingEntry1,              // features
         0,        // DisabledExtensions size
@@ -52,7 +52,7 @@ const GpuControlList::Entry kGpuDataManagerTestingEntries[] = {
     },
     {
         2,  // id
-        "GpuDataManagerImplPrivateTest.GpuSideBlacklisting.1",
+        "GpuDataManagerImplPrivateTest.GpuSideBlocklisting.1",
         base::size(kFeatureListForGpuManagerTestingEntry2),  // features size
         kFeatureListForGpuManagerTestingEntry2,              // features
         0,        // DisabledExtensions size
@@ -86,7 +86,7 @@ const GpuControlList::Entry kGpuDataManagerTestingEntries[] = {
     },
     {
         3,  // id
-        "GpuDataManagerImplPrivateTest.GpuSideBlacklistingWebGL.0",
+        "GpuDataManagerImplPrivateTest.GpuSideBlocklistingWebGL.0",
         base::size(kFeatureListForGpuManagerTestingEntry3),  // features size
         kFeatureListForGpuManagerTestingEntry3,              // features
         0,        // DisabledExtensions size
@@ -120,7 +120,7 @@ const GpuControlList::Entry kGpuDataManagerTestingEntries[] = {
     },
     {
         4,  // id
-        "GpuDataManagerImplPrivateTest.GpuSideBlacklistingWebGL.1",
+        "GpuDataManagerImplPrivateTest.GpuSideBlocklistingWebGL.1",
         base::size(kFeatureListForGpuManagerTestingEntry4),  // features size
         kFeatureListForGpuManagerTestingEntry4,              // features
         0,        // DisabledExtensions size
@@ -188,7 +188,7 @@ const GpuControlList::Entry kGpuDataManagerTestingEntries[] = {
     },
     {
         6,  // id
-        "GpuDataManagerImplPrivateTest.BlacklistAllFeatures",
+        "GpuDataManagerImplPrivateTest.BlocklistAllFeatures",
         base::size(kFeatureListForGpuManagerTestingEntry6),  // features size
         kFeatureListForGpuManagerTestingEntry6,              // features
         0,        // DisabledExtensions size

content/browser/gpu/gpu_data_manager_testing_entry_enums_autogen.h

@@ -13,12 +13,12 @@
 
 namespace gpu {
 enum GpuDataManagerTestingEntryEnum {
-  kGpuDataManagerImplPrivateTest_GpuSideBlacklisting_0 = 0,
-  kGpuDataManagerImplPrivateTest_GpuSideBlacklisting_1 = 1,
-  kGpuDataManagerImplPrivateTest_GpuSideBlacklistingWebGL_0 = 2,
-  kGpuDataManagerImplPrivateTest_GpuSideBlacklistingWebGL_1 = 3,
+  kGpuDataManagerImplPrivateTest_GpuSideBlocklisting_0 = 0,
+  kGpuDataManagerImplPrivateTest_GpuSideBlocklisting_1 = 1,
+  kGpuDataManagerImplPrivateTest_GpuSideBlocklistingWebGL_0 = 2,
+  kGpuDataManagerImplPrivateTest_GpuSideBlocklistingWebGL_1 = 3,
   kGpuDataManagerImplPrivateTest_GpuSideException = 4,
-  kGpuDataManagerImplPrivateTest_BlacklistAllFeatures = 5,
+  kGpuDataManagerImplPrivateTest_BlocklistAllFeatures = 5,
   kGpuDataManagerImplPrivateTest_UpdateActiveGpu = 6,
 };
 }  // namespace gpu

content/browser/gpu/gpu_internals_ui.cc

@@ -821,7 +821,7 @@ void GpuMessageHandler::OnGpuInfoUpdate() {
       GpuDataManagerImpl::GetInstance()->GetGpuExtraInfo();
   auto gpu_info_val = GpuInfoAsDictionaryValue();
 
-  // Add in blacklisting features
+  // Add in blocklisting features
   auto feature_status = std::make_unique<base::DictionaryValue>();
   feature_status->Set("featureStatus", GetFeatureStatus());
   feature_status->Set("problems", GetProblems());

content/browser/gpu/gpu_process_host.h

@@ -72,7 +72,7 @@ class GpuProcessHost : public BrowserChildProcessHostDelegate,
   // Returns null on failure. It is not safe to store the pointer once control
   // has returned to the message loop as it can be destroyed. Instead store the
   // associated GPU host ID.  This could return NULL if GPU access is not
-  // allowed (blacklisted).
+  // allowed (blocklisted).
   CONTENT_EXPORT static GpuProcessHost* Get(
       GpuProcessKind kind = GPU_PROCESS_KIND_SANDBOXED,
       bool force_create = true);