Skip to content

Commit e1fd2ac

Browse files
TextPainter migration cleanup (#132317)
Undo temporary changes made in #132094
1 parent f9a578d commit e1fd2ac

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

dev/bots/test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ final String flutterTester = path.join(flutterRoot, 'bin', 'cache', 'artifacts',
102102

103103
/// The arguments to pass to `flutter test` (typically the local engine
104104
/// configuration) -- prefilled with the arguments passed to test.dart.
105-
final List<String> flutterTestArgs = <String>['--dart-define=SKPARAGRAPH_REMOVE_ROUNDING_HACK=true'];
105+
final List<String> flutterTestArgs = <String>[];
106106

107107
/// Environment variables to override the local engine when running `pub test`,
108108
/// if such flags are provided to `test.dart`.
@@ -1309,8 +1309,8 @@ Future<void> _runFlutterDriverWebTest({
13091309
await runCommand(
13101310
flutter,
13111311
<String>[
1312-
'drive',
13131312
...flutterTestArgs,
1313+
'drive',
13141314
if (driver != null) '--driver=$driver',
13151315
'--target=$target',
13161316
'--browser-name=chrome',
@@ -1584,8 +1584,8 @@ Future<void> _runGalleryE2eWebTest(String buildMode, { bool canvasKit = false })
15841584
await runCommand(
15851585
flutter,
15861586
<String>[
1587-
'drive',
15881587
...flutterTestArgs,
1588+
'drive',
15891589
if (canvasKit)
15901590
'--dart-define=FLUTTER_WEB_USE_SKIA=true',
15911591
if (!canvasKit)
@@ -1665,10 +1665,10 @@ Future<void> _runWebReleaseTest(String target, {
16651665
await runCommand(
16661666
flutter,
16671667
<String>[
1668+
...flutterTestArgs,
16681669
'build',
16691670
'web',
16701671
'--release',
1671-
...flutterTestArgs,
16721672
...additionalArguments,
16731673
'-t',
16741674
target,

packages/flutter/lib/src/painting/text_painter.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -515,13 +515,7 @@ class TextPainter {
515515
_locale = locale,
516516
_strutStyle = strutStyle,
517517
_textWidthBasis = textWidthBasis,
518-
_textHeightBehavior = textHeightBehavior,
519-
assert(() {
520-
if (const bool.fromEnvironment('SKPARAGRAPH_REMOVE_ROUNDING_HACK')) {
521-
ui.ParagraphBuilder.setDisableRoundingHack(true);
522-
}
523-
return true;
524-
}());
518+
_textHeightBehavior = textHeightBehavior;
525519

526520
/// Computes the width of a configured [TextPainter].
527521
///

0 commit comments

Comments
 (0)