Skip to content

Commit e48b7e9

Browse files
goderbauergoderbauer
authored
More word substiturions (flutter#59497)
1 parent 4173881 commit e48b7e9

File tree

6 files changed

+27
-13
lines changed

6 files changed

+27
-13
lines changed

‎packages/flutter_tools/lib/src/android/android_device.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,8 @@ class AndroidDevice extends Device {
644644
...<String>['--ez', 'skia-deterministic-rendering', 'true'],
645645
if (debuggingOptions.traceSkia)
646646
...<String>['--ez', 'trace-skia', 'true'],
647-
if (debuggingOptions.traceWhitelist != null)
648-
...<String>['--ez', 'trace-whitelist', debuggingOptions.traceWhitelist],
647+
if (debuggingOptions.traceAllowlist != null)
648+
...<String>['--ez', 'trace-allowlist', debuggingOptions.traceAllowlist],
649649
if (debuggingOptions.traceSystrace)
650650
...<String>['--ez', 'trace-systrace', 'true'],
651651
if (debuggingOptions.endlessTraceBuffer)

‎packages/flutter_tools/lib/src/commands/run.dart

+18-4
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,14 @@ class RunCommand extends RunCommandBase {
107107
'By default, Flutter will not log skia code.',
108108
)
109109
..addOption('trace-whitelist',
110+
hide: true,
111+
help: '(deprecated) Use --trace-allowlist instead',
112+
valueHelp: 'foo,bar',
113+
)
114+
..addOption('trace-allowlist',
115+
hide: true,
110116
help: 'Filters out all trace events except those that are specified in '
111-
'this comma separated list of whitelisted prefixes.',
117+
'this comma separated list of allowed prefixes.',
112118
valueHelp: 'foo,bar',
113119
)
114120
..addFlag('endless-trace-buffer',
@@ -147,8 +153,8 @@ class RunCommand extends RunCommandBase {
147153
hide: !verboseHelp,
148154
help: 'Pass a list of comma separated flags to the Dart instance at '
149155
'application startup. Flags passed through this option must be '
150-
'present on the whitelist defined within the Flutter engine. If '
151-
'a non-whitelisted flag is encountered, the process will be '
156+
'present on the allowlist defined within the Flutter engine. If '
157+
'a disallowed flag is encountered, the process will be '
152158
'terminated immediately.\n\n'
153159
'This flag is not available on the stable channel and is only '
154160
'applied in debug and profile modes. This option should only '
@@ -348,6 +354,14 @@ class RunCommand extends RunCommandBase {
348354
}
349355
}
350356

357+
String get _traceAllowlist {
358+
final String deprecatedValue = stringArg('trace-whitelist');
359+
if (deprecatedValue != null) {
360+
globals.printError('--trace-whitelist has been deprecated, use --trace-allowlist instead');
361+
}
362+
return stringArg('trace-allowlist') ?? deprecatedValue;
363+
}
364+
351365
DebuggingOptions _createDebuggingOptions() {
352366
final BuildInfo buildInfo = getBuildInfo();
353367
final int browserDebugPort = featureFlags.isWebEnabled && argResults.wasParsed('web-browser-debug-port')
@@ -374,7 +388,7 @@ class RunCommand extends RunCommandBase {
374388
enableSoftwareRendering: boolArg('enable-software-rendering'),
375389
skiaDeterministicRendering: boolArg('skia-deterministic-rendering'),
376390
traceSkia: boolArg('trace-skia'),
377-
traceWhitelist: stringArg('trace-whitelist'),
391+
traceAllowlist: _traceAllowlist,
378392
traceSystrace: boolArg('trace-systrace'),
379393
endlessTraceBuffer: boolArg('endless-trace-buffer'),
380394
dumpSkpOnShaderCompilation: dumpSkpOnShaderCompilation,

‎packages/flutter_tools/lib/src/device.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ class DebuggingOptions {
646646
this.enableSoftwareRendering = false,
647647
this.skiaDeterministicRendering = false,
648648
this.traceSkia = false,
649-
this.traceWhitelist,
649+
this.traceAllowlist,
650650
this.traceSystrace = false,
651651
this.endlessTraceBuffer = false,
652652
this.dumpSkpOnShaderCompilation = false,
@@ -676,7 +676,7 @@ class DebuggingOptions {
676676
this.webRunHeadless = false,
677677
this.webBrowserDebugPort,
678678
this.cacheSkSL = false,
679-
this.traceWhitelist,
679+
this.traceAllowlist,
680680
}) : debuggingEnabled = false,
681681
useTestFonts = false,
682682
startPaused = false,
@@ -704,7 +704,7 @@ class DebuggingOptions {
704704
final bool enableSoftwareRendering;
705705
final bool skiaDeterministicRendering;
706706
final bool traceSkia;
707-
final String traceWhitelist;
707+
final String traceAllowlist;
708708
final bool traceSystrace;
709709
final bool endlessTraceBuffer;
710710
final bool dumpSkpOnShaderCompilation;

‎packages/flutter_tools/lib/src/ios/devices.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ class IOSDevice extends Device {
380380
if (debuggingOptions.enableSoftwareRendering) '--enable-software-rendering',
381381
if (debuggingOptions.skiaDeterministicRendering) '--skia-deterministic-rendering',
382382
if (debuggingOptions.traceSkia) '--trace-skia',
383-
if (debuggingOptions.traceWhitelist != null) '--trace-whitelist="${debuggingOptions.traceWhitelist}"',
383+
if (debuggingOptions.traceAllowlist != null) '--trace-allowlist="${debuggingOptions.traceAllowlist}"',
384384
if (debuggingOptions.endlessTraceBuffer) '--endless-trace-buffer',
385385
if (debuggingOptions.dumpSkpOnShaderCompilation) '--dump-skp-on-shader-compilation',
386386
if (debuggingOptions.verboseSystemLogs) '--verbose-logging',

‎packages/flutter_tools/lib/src/ios/simulators.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ class IOSSimulator extends Device {
422422
if (debuggingOptions.disableServiceAuthCodes) '--disable-service-auth-codes',
423423
if (debuggingOptions.skiaDeterministicRendering) '--skia-deterministic-rendering',
424424
if (debuggingOptions.useTestFonts) '--use-test-fonts',
425-
if (debuggingOptions.traceWhitelist != null) '--trace-whitelist="${debuggingOptions.traceWhitelist}"',
425+
if (debuggingOptions.traceAllowlist != null) '--trace-allowlist="${debuggingOptions.traceAllowlist}"',
426426
'--observatory-port=${debuggingOptions.hostVmServicePort ?? 0}',
427427
],
428428
];

‎packages/flutter_tools/test/general.shard/android/android_device_start_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void main() {
244244
'--ez', 'enable-software-rendering', 'true',
245245
'--ez', 'skia-deterministic-rendering', 'true',
246246
'--ez', 'trace-skia', 'true',
247-
'--ez', 'trace-whitelist', 'bar,baz',
247+
'--ez', 'trace-allowlist', 'bar,baz',
248248
'--ez', 'trace-systrace', 'true',
249249
'--ez', 'endless-trace-buffer', 'true',
250250
'--ez', 'dump-skp-on-shader-compilation', 'true',
@@ -272,7 +272,7 @@ void main() {
272272
enableSoftwareRendering: true,
273273
skiaDeterministicRendering: true,
274274
traceSkia: true,
275-
traceWhitelist: 'bar,baz',
275+
traceAllowlist: 'bar,baz',
276276
traceSystrace: true,
277277
endlessTraceBuffer: true,
278278
dumpSkpOnShaderCompilation: true,

0 commit comments

Comments
 (0)