firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[web] Make FLUTTER_WEB_AUTO_DETECT false by default (#160191)

Browse Source 
Now that "auto" is not supported anymore, it makes more sense to make
this dart define false by default. And there's no need to pass
`FLUTTER_WEB_AUTO_DETECT=false` anymore.
This commit is contained in:
Mouad Debbar 2024-12-27 15:56:25 -05:00 committed by GitHub
parent afc68e3a10
commit 8731c396a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 11 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/bots/suite_runners/run_web_tests.dart
View File

@ -376,7 +376,6 @@ class WebTestsSuite {
'web-server',
'--$buildMode',
// '--web-renderer=$webRenderer',
'--dart-define=FLUTTER_WEB_AUTO_DETECT=false',
if (webRenderer == 'skwasm') ...<String>[
// See: WebRendererMode.dartDefines[skwasm]
'--dart-define=FLUTTER_WEB_USE_SKIA=false',
@ -513,7 +512,6 @@ class WebTestsSuite {
'drive',
if (canvasKit) '--dart-define=FLUTTER_WEB_USE_SKIA=true',
if (!canvasKit) '--dart-define=FLUTTER_WEB_USE_SKIA=false',
if (!canvasKit) '--dart-define=FLUTTER_WEB_AUTO_DETECT=false',
'--driver=test_driver/transitions_perf_e2e_test.dart',
'--target=test_driver/transitions_perf_e2e.dart',
'--browser-name=chrome',
@ -575,7 +573,6 @@ class WebTestsSuite {
'chrome',
'--web-run-headless',
'--dart-define=FLUTTER_WEB_USE_SKIA=false',
'--dart-define=FLUTTER_WEB_AUTO_DETECT=false',
...additionalArguments,
'-t',
target,
@ -742,7 +739,6 @@ class WebTestsSuite {
'-v',
'--platform=chrome',
if (useWasm) '--wasm',
'--dart-define=FLUTTER_WEB_AUTO_DETECT=false',
// '--web-renderer=$webRenderer',
if (webRenderer == 'skwasm') ...<String>[
// See: WebRendererMode.dartDefines[skwasm]

8
engine/src/flutter/lib/web_ui/dev/steps/compile_bundle_step.dart
View File

@ -217,10 +217,6 @@ class Dart2JSCompiler extends TestCompiler {
'--disable-inlining',
'--enable-asserts',
// We do not want to auto-select a renderer in tests. As of today, tests
// are designed to run in one specific mode. So instead, we specify the
// renderer explicitly.
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=${renderer == Renderer.canvaskit}',
'-DFLUTTER_WEB_USE_SKWASM=${renderer == Renderer.skwasm}',
@ -279,10 +275,6 @@ class Dart2WasmCompiler extends TestCompiler {
'--enable-asserts',
'--enable-experimental-wasm-interop',
// We do not want to auto-select a renderer in tests. As of today, tests
// are designed to run in one specific mode. So instead, we specify the
// renderer explicitly.
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=${renderer == Renderer.canvaskit}',
'-DFLUTTER_WEB_USE_SKWASM=${renderer == Renderer.skwasm}',

9
engine/src/flutter/lib/web_ui/lib/src/engine/configuration.dart
View File

@ -174,12 +174,9 @@ class FlutterConfiguration {
/// Auto detect which rendering backend to use.
///
/// Using flutter tools option "--web-renderer=auto" or not specifying one
/// would set the value to true. Otherwise, it would be false.
static const bool flutterWebAutoDetect = bool.fromEnvironment(
'FLUTTER_WEB_AUTO_DETECT',
defaultValue: true,
);
/// Using flutter tools option "--web-renderer=auto" would set the value to
/// true. Otherwise, it would be false.
static const bool flutterWebAutoDetect = bool.fromEnvironment('FLUTTER_WEB_AUTO_DETECT');
static const bool flutterWebUseSkwasm = bool.fromEnvironment('FLUTTER_WEB_USE_SKWASM');

18
packages/flutter_tools/lib/src/web/compile.dart
View File

@ -239,21 +239,9 @@ enum WebRendererMode {
Iterable<String> get dartDefines => switch (this) {
auto => const <String>{'FLUTTER_WEB_AUTO_DETECT=true'},
canvaskit => const <String>{
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=true',
'FLUTTER_WEB_USE_SKWASM=false',
},
html => const <String>{
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=false',
'FLUTTER_WEB_USE_SKWASM=false',
},
skwasm => const <String>{
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=false',
'FLUTTER_WEB_USE_SKWASM=true',
},
canvaskit => const <String>{'FLUTTER_WEB_USE_SKIA=true', 'FLUTTER_WEB_USE_SKWASM=false'},
html => const <String>{'FLUTTER_WEB_USE_SKIA=false', 'FLUTTER_WEB_USE_SKWASM=false'},
skwasm => const <String>{'FLUTTER_WEB_USE_SKIA=false', 'FLUTTER_WEB_USE_SKWASM=true'},
};
/// Sets the dart defines for the currently selected WebRendererMode

30
packages/flutter_tools/test/general.shard/build_system/targets/web_defines_test.dart
View File

@ -20,20 +20,12 @@ void main() {
test('canvaskit web-renderer with no dart-defines', () {
dartDefines = WebRendererMode.canvaskit.updateDartDefines(dartDefines);
expect(dartDefines, <String>[
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=true',
'FLUTTER_WEB_USE_SKWASM=false',
]);
expect(dartDefines, <String>['FLUTTER_WEB_USE_SKIA=true', 'FLUTTER_WEB_USE_SKWASM=false']);
});
test('html web-renderer with no dart-defines', () {
dartDefines = WebRendererMode.html.updateDartDefines(dartDefines);
expect(dartDefines, <String>[
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=false',
'FLUTTER_WEB_USE_SKWASM=false',
]);
expect(dartDefines, <String>['FLUTTER_WEB_USE_SKIA=false', 'FLUTTER_WEB_USE_SKWASM=false']);
});
test('auto web-renderer with existing dart-defines', () {
@ -45,31 +37,19 @@ void main() {
test('canvaskit web-renderer with existing dart-defines', () {
dartDefines = <String>['FLUTTER_WEB_USE_SKIA=false'];
dartDefines = WebRendererMode.canvaskit.updateDartDefines(dartDefines);
expect(dartDefines, <String>[
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=true',
'FLUTTER_WEB_USE_SKWASM=false',
]);
expect(dartDefines, <String>['FLUTTER_WEB_USE_SKIA=true', 'FLUTTER_WEB_USE_SKWASM=false']);
});
test('html web-renderer with existing dart-defines', () {
dartDefines = <String>['FLUTTER_WEB_USE_SKIA=true'];
dartDefines = WebRendererMode.html.updateDartDefines(dartDefines);
expect(dartDefines, <String>[
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=false',
'FLUTTER_WEB_USE_SKWASM=false',
]);
expect(dartDefines, <String>['FLUTTER_WEB_USE_SKIA=false', 'FLUTTER_WEB_USE_SKWASM=false']);
});
test('skwasm web-renderer with existing dart-defines', () {
dartDefines = <String>['FLUTTER_WEB_USE_SKWASM=false'];
dartDefines = WebRendererMode.skwasm.updateDartDefines(dartDefines);
expect(dartDefines, <String>[
'FLUTTER_WEB_AUTO_DETECT=false',
'FLUTTER_WEB_USE_SKIA=false',
'FLUTTER_WEB_USE_SKWASM=true',
]);
expect(dartDefines, <String>['FLUTTER_WEB_USE_SKIA=false', 'FLUTTER_WEB_USE_SKWASM=true']);
});
});
}

30
packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
View File

@ -501,7 +501,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -519,7 +518,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -548,7 +546,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -566,7 +563,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -595,7 +591,6 @@ void main() {
..._kDart2jsLinuxArgs,
'--enable-experiment=non-nullable',
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -614,7 +609,6 @@ void main() {
..._kDart2jsLinuxArgs,
'--enable-experiment=non-nullable',
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -641,7 +635,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -659,7 +652,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -686,7 +678,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -704,7 +695,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -731,7 +721,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -750,7 +739,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -779,7 +767,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -797,7 +784,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -825,7 +811,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -846,7 +831,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -886,7 +870,6 @@ void main() {
'-Ddart.vm.product=true',
'-DFOO=bar',
'-DBAZ=qux',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -906,7 +889,6 @@ void main() {
'-Ddart.vm.product=true',
'-DFOO=bar',
'-DBAZ=qux',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -933,7 +915,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -950,7 +931,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.product=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -978,7 +958,6 @@ void main() {
'-Ddart.vm.profile=true',
'-DFOO=bar',
'-DBAZ=qux',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -998,7 +977,6 @@ void main() {
'-Ddart.vm.profile=true',
'-DFOO=bar',
'-DBAZ=qux',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1027,7 +1005,6 @@ void main() {
..._kDart2jsLinuxArgs,
'-DFOO=bar',
'-DBAZ=qux',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1047,7 +1024,6 @@ void main() {
..._kDart2jsLinuxArgs,
'-DFOO=bar',
'-DBAZ=qux',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1076,7 +1052,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1094,7 +1069,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1125,7 +1099,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1143,7 +1116,6 @@ void main() {
command: <String>[
..._kDart2jsLinuxArgs,
'-Ddart.vm.profile=true',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
@ -1201,12 +1173,10 @@ void main() {
],
...defines.map((String define) => '-D$define'),
if (renderer == WebRendererMode.skwasm) ...<String>[
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=false',
'-DFLUTTER_WEB_USE_SKWASM=true',
],
if (renderer == WebRendererMode.canvaskit) ...<String>[
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
],

1
packages/flutter_tools/test/general.shard/test/web_test_compiler_test.dart
View File

@ -43,7 +43,6 @@ void main() {
'--incremental',
'--target=dartdevc',
'--experimental-emit-debug-metadata',
'-DFLUTTER_WEB_AUTO_DETECT=false',
'-DFLUTTER_WEB_USE_SKIA=true',
'-DFLUTTER_WEB_USE_SKWASM=false',
'--output-dill',