Change some instances of whitelist/blacklist

Bug: chromium:1101491
Bug: b/161896447

Change-Id: I7e3bf4ed63b2170fb08fe1ec8e7d934e7fcdca7c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306644
Reviewed-by: Leon Scroggins <[email protected]>
Commit-Queue: Eric Boren <[email protected]>

Author: erock2112

gn/gn_to_bp_utils.py

@@ -37,8 +37,8 @@ def GrabDependentValues(js, name, value_type, list_to_extend, exclude):
   for dep in js['targets'][name]['deps']:
     if 'modules' in dep:
       skip = True
-      for white_list in ['skshaper', 'skparagraph']:
-        if white_list in dep:
+      for include in ['skshaper', 'skparagraph']:
+        if include in dep:
           skip = False
       if skip:
         continue   # Modules require special handling -- skip for now.

infra/bots/gen_tasks_logic/nano_flags.go

@@ -289,7 +289,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 	}
 
 	if doUpload {
-		keysBlacklist := map[string]bool{
+		keysExclude := map[string]bool{
 			"configuration": true,
 			"role":          true,
 			"test_filter":   true,
@@ -301,7 +301,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 		sort.Strings(keys)
 		args = append(args, "--key")
 		for _, k := range keys {
-			if !keysBlacklist[k] {
+			if !keysExclude[k] {
 				args = append(args, k, b.parts[k])
 			}
 		}

infra/bots/recipes/perf_skottiewasm_lottieweb.py

@@ -26,7 +26,7 @@
   'vars',
 ]
 
-LOTTIE_WEB_BLACKLIST = [
+LOTTIE_WEB_EXCLUDE = [
   # See https://bugs.chromium.org/p/skia/issues/detail?id=9187#c4
   'lottiefiles.com - Progress Success.json',
   # Fails with "val2 is not defined".
@@ -44,7 +44,7 @@
   'stacking.json',
 ]
 
-SKOTTIE_WASM_BLACKLIST = [
+SKOTTIE_WASM_EXCLUDE = [
   # Trace file has majority main_frame_aborted terminations in it and < 25
   # occurrences of submitted_frame + missed_frame.
   # Below descriptions are added from fmalita@'s comments in
@@ -73,7 +73,7 @@
 ]
 
 # These files work in SVG but not in Canvas.
-LOTTIE_WEB_CANVAS_BLACKLIST = LOTTIE_WEB_BLACKLIST + [
+LOTTIE_WEB_CANVAS_EXCLUDE = LOTTIE_WEB_EXCLUDE + [
   'Hello World.json',
   'interactive_menu.json',
   'Name.json',
@@ -104,19 +104,19 @@ def RunSteps(api):
         '--canvaskit_wasm', canvaskit_wasm_path,
     ]
     lottie_files = [x for x in lottie_files
-                    if api.path.basename(x) not in SKOTTIE_WASM_BLACKLIST]
+                    if api.path.basename(x) not in SKOTTIE_WASM_EXCLUDE]
   elif 'LottieWeb' in buildername:
     source_type = 'lottie-web'
     renderer = 'lottie-web'
     if 'Canvas' in buildername:
       backend = 'canvas'
       lottie_files = [
           x for x in lottie_files
-          if api.path.basename(x) not in LOTTIE_WEB_CANVAS_BLACKLIST]
+          if api.path.basename(x) not in LOTTIE_WEB_CANVAS_EXCLUDE]
     else:
       backend = 'svg'
       lottie_files = [x for x in lottie_files
-                      if api.path.basename(x) not in LOTTIE_WEB_BLACKLIST]
+                      if api.path.basename(x) not in LOTTIE_WEB_EXCLUDE]
 
     perf_app_dir = checkout_root.join('skia', 'tools', 'lottie-web-perf')
     lottie_web_js_path = perf_app_dir.join('lottie-web-perf.js')

src/core/SkFuzzLogging.h

@@ -11,7 +11,7 @@
 // Utilities for Skia's fuzzer
 
 // When SK_FUZZ_LOGGING is defined SkDebugfs relevant to image filter fuzzing
-// will be enabled. This allows the filter fuzzing code to white list fuzzer
+// will be enabled. This allows the filter fuzzing code to include fuzzer
 // failures based on the output logs.
 // Define this flag in your SkUserConfig.h or in your Make/Build system.
 #ifdef SK_FUZZ_LOGGING