TextPainter migration cleanup (#132317)

Undo temporary changes made in #132094
This commit is contained in:
LongCatIsLooong 2023-08-10 13:18:51 -07:00 committed by GitHub
parent f9a578dd82
commit e1fd2ace92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions

View File

@ -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<String> flutterTestArgs = <String>['--dart-define=SKPARAGRAPH_REMOVE_ROUNDING_HACK=true'];
final List<String> flutterTestArgs = <String>[];
/// Environment variables to override the local engine when running `pub test`,
/// if such flags are provided to `test.dart`.
@ -1309,8 +1309,8 @@ Future<void> _runFlutterDriverWebTest({
await runCommand(
flutter,
<String>[
'drive',
...flutterTestArgs,
'drive',
if (driver != null) '--driver=$driver',
'--target=$target',
'--browser-name=chrome',
@ -1584,8 +1584,8 @@ Future<void> _runGalleryE2eWebTest(String buildMode, { bool canvasKit = false })
await runCommand(
flutter,
<String>[
'drive',
...flutterTestArgs,
'drive',
if (canvasKit)
'--dart-define=FLUTTER_WEB_USE_SKIA=true',
if (!canvasKit)
@ -1665,10 +1665,10 @@ Future<void> _runWebReleaseTest(String target, {
await runCommand(
flutter,
<String>[
...flutterTestArgs,
'build',
'web',
'--release',
...flutterTestArgs,
...additionalArguments,
'-t',
target,

View File

@ -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].
///