diff --git a/dev/bots/test.dart b/dev/bots/test.dart index fd91ada4f6..2b48df0328 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -102,7 +102,7 @@ final String flutterTester = path.join(flutterRoot, 'bin', 'cache', 'artifacts', /// The arguments to pass to `flutter test` (typically the local engine /// configuration) -- prefilled with the arguments passed to test.dart. -final List flutterTestArgs = ['--dart-define=SKPARAGRAPH_REMOVE_ROUNDING_HACK=true']; +final List flutterTestArgs = []; /// Environment variables to override the local engine when running `pub test`, /// if such flags are provided to `test.dart`. @@ -1309,8 +1309,8 @@ Future _runFlutterDriverWebTest({ await runCommand( flutter, [ - 'drive', ...flutterTestArgs, + 'drive', if (driver != null) '--driver=$driver', '--target=$target', '--browser-name=chrome', @@ -1584,8 +1584,8 @@ Future _runGalleryE2eWebTest(String buildMode, { bool canvasKit = false }) await runCommand( flutter, [ - 'drive', ...flutterTestArgs, + 'drive', if (canvasKit) '--dart-define=FLUTTER_WEB_USE_SKIA=true', if (!canvasKit) @@ -1665,10 +1665,10 @@ Future _runWebReleaseTest(String target, { await runCommand( flutter, [ + ...flutterTestArgs, 'build', 'web', '--release', - ...flutterTestArgs, ...additionalArguments, '-t', target, diff --git a/packages/flutter/lib/src/painting/text_painter.dart b/packages/flutter/lib/src/painting/text_painter.dart index c1e01cb36a..6457e7cd37 100644 --- a/packages/flutter/lib/src/painting/text_painter.dart +++ b/packages/flutter/lib/src/painting/text_painter.dart @@ -515,13 +515,7 @@ class TextPainter { _locale = locale, _strutStyle = strutStyle, _textWidthBasis = textWidthBasis, - _textHeightBehavior = textHeightBehavior, - assert(() { - if (const bool.fromEnvironment('SKPARAGRAPH_REMOVE_ROUNDING_HACK')) { - ui.ParagraphBuilder.setDisableRoundingHack(true); - } - return true; - }()); + _textHeightBehavior = textHeightBehavior; /// Computes the width of a configured [TextPainter]. ///