Reland "Remove migration flag and unused header files #50216" (#50259)

LongCatIsLooong · web-flow · commit e10c0aea6038 · 2024-03-05T02:17:05.000Z
Forgot to update a pinned dependency in the previous attempt: flutter/tests#340 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -35661,7 +35661,6 @@ ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../f
 ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/ui/text/line_metrics.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
@@ -38517,7 +38516,6 @@ FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
 FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
 FILE: ../../../flutter/lib/ui/text/font_collection.cc
 FILE: ../../../flutter/lib/ui/text/font_collection.h
-FILE: ../../../flutter/lib/ui/text/line_metrics.h
 FILE: ../../../flutter/lib/ui/text/paragraph.cc
 FILE: ../../../flutter/lib/ui/text/paragraph.h
 FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -123,7 +123,6 @@ source_set("ui") {
     "text/asset_manager_font_provider.h",
     "text/font_collection.cc",
     "text/font_collection.h",
-    "text/line_metrics.h",
     "text/paragraph.cc",
     "text/paragraph.h",
     "text/paragraph_builder.cc",
diff --git a/lib/ui/text.dart b/lib/ui/text.dart
@@ -3376,23 +3376,6 @@ abstract class ParagraphBuilder {
   /// [Paragraph].
   factory ParagraphBuilder(ParagraphStyle style) = _NativeParagraphBuilder;
 
-  /// Whether the rounding hack enabled by default in SkParagraph and TextPainter
-  /// is disabled.
-  ///
-  /// Do not rely on this getter as it exists for migration purposes only and
-  /// will soon be removed.
-  @Deprecated('''
-    The shouldDisableRoundingHack flag is for internal migration purposes only and should not be used.
-  ''')
-  static bool get shouldDisableRoundingHack => _shouldDisableRoundingHack;
-  static bool _shouldDisableRoundingHack = true;
-  /// Do not call this method as it is for migration purposes only and will soon
-  /// be removed.
-  // ignore: use_setters_to_change_properties
-  static void setDisableRoundingHack(bool disableRoundingHack) {
-    _shouldDisableRoundingHack = disableRoundingHack;
-  }
-
   /// The number of placeholders currently in the paragraph.
   int get placeholderCount;
 
@@ -3510,11 +3493,10 @@ base class _NativeParagraphBuilder extends NativeFieldWrapperClass1 implements P
         style._height ?? 0,
         style._ellipsis ?? '',
         _encodeLocale(style._locale),
-        !ParagraphBuilder.shouldDisableRoundingHack,
       );
   }
 
-  @Native<Void Function(Handle, Handle, Handle, Handle, Handle, Double, Double, Handle, Handle, Bool)>(symbol: 'ParagraphBuilder::Create')
+  @Native<Void Function(Handle, Handle, Handle, Handle, Handle, Double, Double, Handle, Handle)>(symbol: 'ParagraphBuilder::Create')
   external void _constructor(
       Int32List encoded,
       ByteData? strutData,
@@ -3524,7 +3506,7 @@ base class _NativeParagraphBuilder extends NativeFieldWrapperClass1 implements P
       double height,
       String ellipsis,
       String locale,
-      bool applyRoundingHack);
+  );
 
   @override
   int get placeholderCount => _placeholderCount;
diff --git a/lib/ui/text/line_metrics.h b/lib/ui/text/line_metrics.h
diff --git a/lib/ui/text/paragraph.h b/lib/ui/text/paragraph.h
@@ -8,7 +8,6 @@
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/canvas.h"
-#include "flutter/lib/ui/text/line_metrics.h"
 #include "flutter/third_party/txt/src/txt/paragraph.h"
 
 namespace flutter {
diff --git a/lib/ui/text/paragraph_builder.cc b/lib/ui/text/paragraph_builder.cc
@@ -151,12 +151,11 @@ void ParagraphBuilder::Create(Dart_Handle wrapper,
                               double fontSize,
                               double height,
                               const std::u16string& ellipsis,
-                              const std::string& locale,
-                              bool applyRoundingHack) {
+                              const std::string& locale) {
   UIDartState::ThrowIfUIOperationsProhibited();
   auto res = fml::MakeRefCounted<ParagraphBuilder>(
       encoded_handle, strutData, fontFamily, strutFontFamilies, fontSize,
-      height, ellipsis, locale, applyRoundingHack);
+      height, ellipsis, locale);
   res->AssociateWithDartWrapper(wrapper);
 }
 
@@ -231,8 +230,7 @@ ParagraphBuilder::ParagraphBuilder(
     double fontSize,
     double height,
     const std::u16string& ellipsis,
-    const std::string& locale,
-    bool applyRoundingHack) {
+    const std::string& locale) {
   int32_t mask = 0;
   txt::ParagraphStyle style;
   {
@@ -293,7 +291,6 @@ ParagraphBuilder::ParagraphBuilder(
   if (mask & kPSLocaleMask) {
     style.locale = locale;
   }
-  style.apply_rounding_hack = applyRoundingHack;
 
   FontCollection& font_collection = UIDartState::Current()
                                         ->platform_configuration()
diff --git a/lib/ui/text/paragraph_builder.h b/lib/ui/text/paragraph_builder.h
@@ -30,8 +30,7 @@ class ParagraphBuilder : public RefCountedDartWrappable<ParagraphBuilder> {
                      double fontSize,
                      double height,
                      const std::u16string& ellipsis,
-                     const std::string& locale,
-                     bool applyRoundingHack);
+                     const std::string& locale);
 
   ~ParagraphBuilder() override;
 
@@ -77,8 +76,7 @@ class ParagraphBuilder : public RefCountedDartWrappable<ParagraphBuilder> {
                             double fontSize,
                             double height,
                             const std::u16string& ellipsis,
-                            const std::string& locale,
-                            bool applyRoundingHack);
+                            const std::string& locale);
 
   std::unique_ptr<txt::ParagraphBuilder> m_paragraph_builder_;
 };
diff --git a/lib/web_ui/lib/src/engine/canvaskit/renderer.dart b/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
@@ -379,7 +379,6 @@ class CanvasKitRenderer implements Renderer {
     strutStyle: strutStyle,
     ellipsis: ellipsis,
     locale: locale,
-    applyRoundingHack: !ui.ParagraphBuilder.shouldDisableRoundingHack,
   );
 
   @override
diff --git a/lib/web_ui/lib/src/engine/canvaskit/text.dart b/lib/web_ui/lib/src/engine/canvaskit/text.dart
@@ -33,7 +33,6 @@ class CkParagraphStyle implements ui.ParagraphStyle {
     ui.StrutStyle? strutStyle,
     String? ellipsis,
     ui.Locale? locale,
-    bool applyRoundingHack = true,
   })  : skParagraphStyle = toSkParagraphStyle(
           textAlign,
           textDirection,
@@ -47,7 +46,6 @@ class CkParagraphStyle implements ui.ParagraphStyle {
           strutStyle,
           ellipsis,
           locale,
-          applyRoundingHack,
         ),
         _textAlign = textAlign,
         _textDirection = textDirection,
@@ -163,7 +161,6 @@ class CkParagraphStyle implements ui.ParagraphStyle {
     ui.StrutStyle? strutStyle,
     String? ellipsis,
     ui.Locale? locale,
-    bool applyRoundingHack,
   ) {
     final SkParagraphStyleProperties properties = SkParagraphStyleProperties();
 
@@ -200,7 +197,7 @@ class CkParagraphStyle implements ui.ParagraphStyle {
     properties.replaceTabCharacters = true;
     properties.textStyle = toSkTextStyleProperties(
         fontFamily, fontSize, height, fontWeight, fontStyle);
-    properties.applyRoundingHack = applyRoundingHack;
+    properties.applyRoundingHack = false;
 
     return canvasKit.ParagraphStyle(properties);
   }
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart
@@ -746,10 +746,8 @@ class SkwasmParagraphStyle extends SkwasmObjectWrapper<RawParagraphStyle> implem
       skStringFree(localeHandle);
     }
     paragraphStyleSetTextStyle(handle, textStyleHandle);
+    paragraphStyleSetApplyRoundingHack(handle, false);
 
-    if (ui.ParagraphBuilder.shouldDisableRoundingHack) {
-      paragraphStyleSetApplyRoundingHack(handle, false);
-    }
     return SkwasmParagraphStyle._(
       handle,
       textStyle,
diff --git a/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart b/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
@@ -87,17 +87,6 @@ class CanvasParagraph implements ui.Paragraph {
 
   @override
   void layout(ui.ParagraphConstraints constraints) {
-    // When constraint width has a decimal place, we floor it to avoid getting
-    // a layout width that's higher than the constraint width.
-    //
-    // For example, if constraint width is `30.8` and the text has a width of
-    // `30.5` then the TextPainter in the framework will ceil the `30.5` width
-    // which will result in a width of `40.0` that's higher than the constraint
-    // width.
-    if (!ui.ParagraphBuilder.shouldDisableRoundingHack) {
-      constraints = ui.ParagraphConstraints(width: constraints.width.floorToDouble());
-    }
-
     if (constraints == _lastUsedConstraints) {
       return;
     }
diff --git a/lib/web_ui/lib/text.dart b/lib/web_ui/lib/text.dart
@@ -733,13 +733,6 @@ abstract class ParagraphBuilder {
   factory ParagraphBuilder(ParagraphStyle style) =>
     engine.renderer.createParagraphBuilder(style);
 
-  static bool get shouldDisableRoundingHack => _shouldDisableRoundingHack;
-  static bool _shouldDisableRoundingHack = true;
-  // ignore: use_setters_to_change_properties
-  static void setDisableRoundingHack(bool disableRoundingHack) {
-    _shouldDisableRoundingHack = disableRoundingHack;
-  }
-
   void pushStyle(TextStyle style);
   void pop();
   void addText(String text);
diff --git a/lib/web_ui/test/html/text/canvas_paragraph_test.dart b/lib/web_ui/test/html/text/canvas_paragraph_test.dart
@@ -777,21 +777,6 @@ Future<void> testMain() async {
     expect(paragraph.longestLine, 50.0);
   });
 
-  test('$CanvasParagraph.width should be a whole integer when shouldDisableRoundingHack is false', () {
-    if (ui.ParagraphBuilder.shouldDisableRoundingHack) {
-      ui.ParagraphBuilder.setDisableRoundingHack(false);
-      addTearDown(() => ui.ParagraphBuilder.setDisableRoundingHack(true));
-    }
-    // The paragraph width is only rounded to a whole integer if
-    // shouldDisableRoundingHack is false.
-    assert(!ui.ParagraphBuilder.shouldDisableRoundingHack);
-    final ui.Paragraph paragraph = plain(ahemStyle, 'abc');
-    paragraph.layout(const ui.ParagraphConstraints(width: 30.8));
-
-    expect(paragraph.width, 30);
-    expect(paragraph.height, 10);
-  });
-
   test('Render after dispose', () async {
     final ui.Paragraph paragraph = plain(ahemStyle, 'abc');
     paragraph.layout(const ui.ParagraphConstraints(width: 30.8));
diff --git a/lib/web_ui/test/html/text_test.dart b/lib/web_ui/test/html/text_test.dart
@@ -200,12 +200,7 @@ Future<void> testMain() async {
     expect(bottomRight?.graphemeClusterLayoutBounds, const Rect.fromLTWH(0.0, 0.0, 10.0, 10.0));
   }, skip: domIntl.v8BreakIterator == null); // Intended: Intl.v8breakiterator is needed for correctly breaking grapheme clusters.
 
-  test('Can disable rounding hack', () {
-    if (!ParagraphBuilder.shouldDisableRoundingHack) {
-      ParagraphBuilder.setDisableRoundingHack(true);
-      addTearDown(() => ParagraphBuilder.setDisableRoundingHack(false));
-    }
-    assert(ParagraphBuilder.shouldDisableRoundingHack);
+  test('disable rounding hack', () {
     const double fontSize = 1;
     const String text = '12345';
     const double letterSpacing = 0.25;
diff --git a/lib/web_ui/test/ui/line_metrics_test.dart b/lib/web_ui/test/ui/line_metrics_test.dart
@@ -97,9 +97,7 @@ Future<void> testMain() async {
     expect(bottomRight?.writingDirection, ui.TextDirection.ltr);
   });
 
-  test('rounding hack disabled by default', () {
-    expect(ui.ParagraphBuilder.shouldDisableRoundingHack, isTrue);
-
+  test('rounding hack is always disabled', () {
     const double fontSize = 1.25;
     const String text = '12345';
     assert((fontSize * text.length).truncate() != fontSize * text.length);
@@ -118,30 +116,4 @@ Future<void> testMain() async {
         expect(metrics, hasLength(1));
     }
   }, skip: isHtml); // The rounding hack doesn't apply to the html renderer
-
-  test('setDisableRoundingHack to false works in tests', () {
-    bool assertsEnabled = false;
-    assert(() {
-      assertsEnabled = true;
-      return true;
-    }());
-    if (!assertsEnabled){
-      return;
-    }
-
-    if (ui.ParagraphBuilder.shouldDisableRoundingHack) {
-      ui.ParagraphBuilder.setDisableRoundingHack(false);
-      addTearDown(() => ui.ParagraphBuilder.setDisableRoundingHack(true));
-    }
-
-    assert(!ui.ParagraphBuilder.shouldDisableRoundingHack);
-    const double fontSize = 1.25;
-    const String text = '12345';
-    assert((fontSize * text.length).truncate() != fontSize * text.length);
-    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle(fontSize: fontSize, fontFamily: 'FlutterTest'));
-    builder.addText(text);
-    final ui.Paragraph paragraph = builder.build()
-      ..layout(const ui.ParagraphConstraints(width: text.length * fontSize));
-    expect(paragraph.computeLineMetrics().length, greaterThan(1));
-  }, skip: isHtml); // The rounding hack doesn't apply to the html renderer
 }
diff --git a/testing/dart/paragraph_test.dart b/testing/dart/paragraph_test.dart
diff --git a/third_party/txt/src/skia/paragraph_builder_skia.cc b/third_party/txt/src/skia/paragraph_builder_skia.cc
diff --git a/third_party/txt/src/txt/paragraph_style.h b/third_party/txt/src/txt/paragraph_style.h
