More word substiturions (#59497)
diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart
index 88f36e6..a9df0c9 100644
--- a/packages/flutter_tools/lib/src/android/android_device.dart
+++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -644,8 +644,8 @@
...<String>['--ez', 'skia-deterministic-rendering', 'true'],
if (debuggingOptions.traceSkia)
...<String>['--ez', 'trace-skia', 'true'],
- if (debuggingOptions.traceWhitelist != null)
- ...<String>['--ez', 'trace-whitelist', debuggingOptions.traceWhitelist],
+ if (debuggingOptions.traceAllowlist != null)
+ ...<String>['--ez', 'trace-allowlist', debuggingOptions.traceAllowlist],
if (debuggingOptions.traceSystrace)
...<String>['--ez', 'trace-systrace', 'true'],
if (debuggingOptions.endlessTraceBuffer)
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart
index 852c2cf..cfc9643 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -107,8 +107,14 @@
'By default, Flutter will not log skia code.',
)
..addOption('trace-whitelist',
+ hide: true,
+ help: '(deprecated) Use --trace-allowlist instead',
+ valueHelp: 'foo,bar',
+ )
+ ..addOption('trace-allowlist',
+ hide: true,
help: 'Filters out all trace events except those that are specified in '
- 'this comma separated list of whitelisted prefixes.',
+ 'this comma separated list of allowed prefixes.',
valueHelp: 'foo,bar',
)
..addFlag('endless-trace-buffer',
@@ -147,8 +153,8 @@
hide: !verboseHelp,
help: 'Pass a list of comma separated flags to the Dart instance at '
'application startup. Flags passed through this option must be '
- 'present on the whitelist defined within the Flutter engine. If '
- 'a non-whitelisted flag is encountered, the process will be '
+ 'present on the allowlist defined within the Flutter engine. If '
+ 'a disallowed flag is encountered, the process will be '
'terminated immediately.\n\n'
'This flag is not available on the stable channel and is only '
'applied in debug and profile modes. This option should only '
@@ -348,6 +354,14 @@
}
}
+ String get _traceAllowlist {
+ final String deprecatedValue = stringArg('trace-whitelist');
+ if (deprecatedValue != null) {
+ globals.printError('--trace-whitelist has been deprecated, use --trace-allowlist instead');
+ }
+ return stringArg('trace-allowlist') ?? deprecatedValue;
+ }
+
DebuggingOptions _createDebuggingOptions() {
final BuildInfo buildInfo = getBuildInfo();
final int browserDebugPort = featureFlags.isWebEnabled && argResults.wasParsed('web-browser-debug-port')
@@ -374,7 +388,7 @@
enableSoftwareRendering: boolArg('enable-software-rendering'),
skiaDeterministicRendering: boolArg('skia-deterministic-rendering'),
traceSkia: boolArg('trace-skia'),
- traceWhitelist: stringArg('trace-whitelist'),
+ traceAllowlist: _traceAllowlist,
traceSystrace: boolArg('trace-systrace'),
endlessTraceBuffer: boolArg('endless-trace-buffer'),
dumpSkpOnShaderCompilation: dumpSkpOnShaderCompilation,
diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart
index 4f8e9a9..2be566f 100644
--- a/packages/flutter_tools/lib/src/device.dart
+++ b/packages/flutter_tools/lib/src/device.dart
@@ -646,7 +646,7 @@
this.enableSoftwareRendering = false,
this.skiaDeterministicRendering = false,
this.traceSkia = false,
- this.traceWhitelist,
+ this.traceAllowlist,
this.traceSystrace = false,
this.endlessTraceBuffer = false,
this.dumpSkpOnShaderCompilation = false,
@@ -676,7 +676,7 @@
this.webRunHeadless = false,
this.webBrowserDebugPort,
this.cacheSkSL = false,
- this.traceWhitelist,
+ this.traceAllowlist,
}) : debuggingEnabled = false,
useTestFonts = false,
startPaused = false,
@@ -704,7 +704,7 @@
final bool enableSoftwareRendering;
final bool skiaDeterministicRendering;
final bool traceSkia;
- final String traceWhitelist;
+ final String traceAllowlist;
final bool traceSystrace;
final bool endlessTraceBuffer;
final bool dumpSkpOnShaderCompilation;
diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart
index 7d83239..33f9139 100644
--- a/packages/flutter_tools/lib/src/ios/devices.dart
+++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -380,7 +380,7 @@
if (debuggingOptions.enableSoftwareRendering) '--enable-software-rendering',
if (debuggingOptions.skiaDeterministicRendering) '--skia-deterministic-rendering',
if (debuggingOptions.traceSkia) '--trace-skia',
- if (debuggingOptions.traceWhitelist != null) '--trace-whitelist="${debuggingOptions.traceWhitelist}"',
+ if (debuggingOptions.traceAllowlist != null) '--trace-allowlist="${debuggingOptions.traceAllowlist}"',
if (debuggingOptions.endlessTraceBuffer) '--endless-trace-buffer',
if (debuggingOptions.dumpSkpOnShaderCompilation) '--dump-skp-on-shader-compilation',
if (debuggingOptions.verboseSystemLogs) '--verbose-logging',
diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart
index 316435d..39bd947 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -422,7 +422,7 @@
if (debuggingOptions.disableServiceAuthCodes) '--disable-service-auth-codes',
if (debuggingOptions.skiaDeterministicRendering) '--skia-deterministic-rendering',
if (debuggingOptions.useTestFonts) '--use-test-fonts',
- if (debuggingOptions.traceWhitelist != null) '--trace-whitelist="${debuggingOptions.traceWhitelist}"',
+ if (debuggingOptions.traceAllowlist != null) '--trace-allowlist="${debuggingOptions.traceAllowlist}"',
'--observatory-port=${debuggingOptions.hostVmServicePort ?? 0}',
],
];
diff --git a/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart b/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart
index 81c0231..56b6450 100644
--- a/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_device_start_test.dart
@@ -244,7 +244,7 @@
'--ez', 'enable-software-rendering', 'true',
'--ez', 'skia-deterministic-rendering', 'true',
'--ez', 'trace-skia', 'true',
- '--ez', 'trace-whitelist', 'bar,baz',
+ '--ez', 'trace-allowlist', 'bar,baz',
'--ez', 'trace-systrace', 'true',
'--ez', 'endless-trace-buffer', 'true',
'--ez', 'dump-skp-on-shader-compilation', 'true',
@@ -272,7 +272,7 @@
enableSoftwareRendering: true,
skiaDeterministicRendering: true,
traceSkia: true,
- traceWhitelist: 'bar,baz',
+ traceAllowlist: 'bar,baz',
traceSystrace: true,
endlessTraceBuffer: true,
dumpSkpOnShaderCompilation: true,
