From bc604a089f0210d30702d56e362aa93de21d802b Mon Sep 17 00:00:00 2001 From: Ferhat Date: Wed, 6 Jan 2021 10:00:52 -0800 Subject: [PATCH] [web] Reland - Switch web-render option default to auto (flutter/engine#23454) --- engine/src/flutter/lib/web_ui/dev/test_runner.dart | 2 ++ .../lib/web_ui/lib/src/engine/canvaskit/initialization.dart | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/lib/web_ui/dev/test_runner.dart b/engine/src/flutter/lib/web_ui/dev/test_runner.dart index 9a67335cf09..a9e9397ae81 100644 --- a/engine/src/flutter/lib/web_ui/dev/test_runner.dart +++ b/engine/src/flutter/lib/web_ui/dev/test_runner.dart @@ -619,6 +619,8 @@ class TestCommand extends Command with ArgUtils { '--enable-experiment=non-nullable', '--no-sound-null-safety', if (input.forCanvasKit) '-DFLUTTER_WEB_USE_SKIA=true', + if (!input.forCanvasKit) '-DFLUTTER_WEB_AUTO_DETECT=false', + if (!input.forCanvasKit) '-DFLUTTER_WEB_USE_SKIA=false', '-O2', '-o', targetFileName, // target path. diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart index 20a9ecd952c..04e148a4ee8 100644 --- a/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart +++ b/engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/initialization.dart @@ -28,10 +28,10 @@ bool _detectRenderer() { /// Auto detect which rendering backend to use. /// -/// Using flutter tools option "--web-render=auto" would set the value to true. -/// Otherwise, it would be false. +/// Using flutter tools option "--web-render=auto" or not specifying one +/// would set the value to true. Otherwise, it would be false. const bool _autoDetect = - bool.fromEnvironment('FLUTTER_WEB_AUTO_DETECT', defaultValue: false); + bool.fromEnvironment('FLUTTER_WEB_AUTO_DETECT', defaultValue: true); /// Enable the Skia-based rendering backend. ///