Move to TextPosition, remove extra fields on LineMetrics (for now)

Author: gspencergoog

lib/ui/text.dart

@@ -1680,8 +1680,6 @@ class LineMetrics {
     this.left,
     this.baseline,
     this.lineNumber,
-    this.startIndex,
-    this.endIndex,
   });
 
   @pragma('vm:entry-point')
@@ -1695,8 +1693,6 @@ class LineMetrics {
     this.left,
     this.baseline,
     this.lineNumber,
-    this.startIndex,
-    this.endIndex,
   );
 
   /// True if this line ends with an explicit line break (e.g. '\n') or is the end
@@ -1764,13 +1760,6 @@ class LineMetrics {
   ///
   /// For example, the first line is line 0, second line is line 1.
   final int lineNumber;
-
-  /// The starting text index for this line, in Unicode code points.
-  final int startIndex;
-
-  /// The ending text index, including the newline for this line, in Unicode
-  /// code points.
-  final int endIndex;
 }
 
 /// A paragraph of text.
@@ -1882,16 +1871,8 @@ class Paragraph extends NativeFieldWrapperClass2 {
   /// on both sides. In such cases, this method will return [offset, offset+1].
   /// Word boundaries are defined more precisely in Unicode Standard Annex #29
   /// http://www.unicode.org/reports/tr29/#Word_Boundaries
-  TextRange getWordBoundary(dynamic position) {
-    // TODO(gspencergoog): have this take only a TextPosition once the framework
-    // code is calling it with that.
-    List<int> boundary;
-    if (position is TextPosition) {
-      boundary = _getWordBoundary(position.offset);
-    } else {
-      final int offset = position;
-      boundary = _getWordBoundary(offset);
-    }
+  TextRange getWordBoundary(TextPosition position) {
+    final List<int> boundary = _getWordBoundary(position.offset);
     return TextRange(start: boundary[0], end: boundary[1]);
   }
   List<int> _getWordBoundary(int offset) native 'Paragraph_getWordBoundary';
@@ -1901,10 +1882,12 @@ class Paragraph extends NativeFieldWrapperClass2 {
   /// The newline (if any) is returned as part of the range.
   ///
   /// This can potentially be expensive, since it needs to compute the line
-  /// metrics, so use it sparingly. If higher performance is needed, caching the
-  /// results of [computeLineMetrics] is recommended (which also contains the
-  /// start and end of each line).
-  List<int> getLineBoundary(int offset) native 'Paragraph_getLineBoundary';
+  /// metrics, so use it sparingly.
+  TextRange getLineBoundary(TextPosition position) {
+    final List<int> boundary = _getLineBoundary(position.offset);
+    return TextRange(start: boundary[0], end: boundary[1]);
+  }
+  List<int> _getLineBoundary(int offset) native 'Paragraph_getLineBoundary';
 
   // Redirecting the paint function in this way solves some dependency problems
   // in the C++ code. If we straighten out the C++ dependencies, we can remove

lib/ui/text/line_metrics.cc

@@ -27,7 +27,7 @@ Dart_Handle GetLineMetricsType() {
 
 Dart_Handle DartConverter<flutter::LineMetrics>::ToDart(
     const flutter::LineMetrics& val) {
-  constexpr int argc = 11;
+  constexpr int argc = 9;
 
   Dart_Handle argv[argc] = {
       tonic::ToDart(*val.hard_break), tonic::ToDart(*val.ascent),
@@ -37,8 +37,7 @@ Dart_Handle DartConverter<flutter::LineMetrics>::ToDart(
       // than the one in LibTxt.
       tonic::ToDart(round(*val.ascent + *val.descent)),
       tonic::ToDart(*val.width), tonic::ToDart(*val.left),
-      tonic::ToDart(*val.baseline), tonic::ToDart(*val.line_number),
-      tonic::ToDart(*val.start_index), tonic::ToDart(*val.end_index)};
+      tonic::ToDart(*val.baseline), tonic::ToDart(*val.line_number)};
   return Dart_New(GetLineMetricsType(), tonic::ToDart("_"), argc, argv);
 }
 

lib/ui/text/line_metrics.h

@@ -34,10 +34,6 @@ struct LineMetrics {
   const double* baseline;
   // Zero indexed line number.
   const size_t* line_number;
-  // The starting text index for this line.
-  const size_t* start_index;
-  // The ending index for this line, including the newline, if any.
-  const size_t* end_index;
 
   LineMetrics();
 
@@ -49,9 +45,7 @@ struct LineMetrics {
               const double* width,
               const double* left,
               const double* baseline,
-              const size_t* line_number,
-              const size_t* start_index,
-              const size_t* end_index)
+              const size_t* line_number)
       : hard_break(hard_break),
         ascent(ascent),
         descent(descent),
@@ -60,9 +54,7 @@ struct LineMetrics {
         width(width),
         left(left),
         baseline(baseline),
-        line_number(line_number),
-        start_index(start_index),
-        end_index(end_index) {}
+        line_number(line_number) {}
 };
 
 }  // namespace flutter

lib/ui/text/paragraph.cc

@@ -158,8 +158,7 @@ std::vector<LineMetrics> Paragraph::computeLineMetrics() {
   for (txt::LineMetrics& line : metrics) {
     result.emplace_back(&line.hard_break, &line.ascent, &line.descent,
                         &line.unscaled_ascent, &line.height, &line.width,
-                        &line.left, &line.baseline, &line.line_number,
-                        &line.start_index, &line.end_index);
+                        &line.left, &line.baseline, &line.line_number);
   }
   return result;
 }

lib/web_ui/lib/src/engine/text/paragraph.dart

@@ -281,31 +281,19 @@ class EngineParagraph implements ui.Paragraph {
   }
 
   @override
-  ui.TextRange getWordBoundary(dynamic position) {
-    // TODO(gspencergoog): have this take only a TextPosition once the framework
-    // code is calling it with that.
-    if (position is ui.TextPosition) {
-      ui.TextPosition textPosition = position;
-      if (_plainText == null) {
-        return ui.TextRange(start: textPosition.offset, end: textPosition.offset);
-      }
-
-      final int start = WordBreaker.prevBreakIndex(_plainText, textPosition.offset);
-      final int end = WordBreaker.nextBreakIndex(_plainText, textPosition.offset);
-      return ui.TextRange(start: start, end: end);
-    }
-
+  ui.TextRange getWordBoundary(ui.TextPosition position) {
+    ui.TextPosition textPosition = position;
     if (_plainText == null) {
-      return ui.TextRange(start: position, end: position);
+      return ui.TextRange(start: textPosition.offset, end: textPosition.offset);
     }
 
-    final int start = WordBreaker.prevBreakIndex(_plainText, position);
-    final int end = WordBreaker.nextBreakIndex(_plainText, position);
+    final int start = WordBreaker.prevBreakIndex(_plainText, textPosition.offset);
+    final int end = WordBreaker.nextBreakIndex(_plainText, textPosition.offset);
     return ui.TextRange(start: start, end: end);
   }
 
   @override
-  List<int> getLineBoundary(int offset) {
+  ui.TextRange getLineBoundary(ui.TextPosition position) {
     // TODO(flutter_web): https://github.com/flutter/flutter/issues/39537
     // Depends upon LineMetrics measurement.
     return null;

lib/web_ui/lib/src/ui/text.dart

@@ -1111,8 +1111,6 @@ class LineMetrics {
     this.left,
     this.baseline,
     this.lineNumber,
-    this.startIndex,
-    this.endIndex,
   });
 
   @pragma('vm:entry-point')
@@ -1126,8 +1124,6 @@ class LineMetrics {
     this.left,
     this.baseline,
     this.lineNumber,
-    this.startIndex,
-    this.endIndex,
   );
 
   final bool hardBreak;
@@ -1147,10 +1143,6 @@ class LineMetrics {
   final double baseline;
 
   final int lineNumber;
-
-  final int startIndex;
-
-  final int endIndex;
 }
 
 /// A paragraph of text.
@@ -1250,17 +1242,15 @@ abstract class Paragraph {
   /// on both sides. In such cases, this method will return [offset, offset+1].
   /// Word boundaries are defined more precisely in Unicode Standard Annex #29
   /// http://www.unicode.org/reports/tr29/#Word_Boundaries
-  TextRange getWordBoundary(dynamic position);
+  TextRange getWordBoundary(TextPosition  position);
 
-  /// Returns the [start, end] of the line at the given offset.
+  /// Returns the [TextRange] of the line at the given offset.
   ///
   /// The newline (if any) is returned as part of the range.
   ///
   /// This can potentially be expensive, since it needs to compute the line
-  /// metrics, so use it sparingly. If higher performance is needed, caching the
-  /// results of [computeLineMetrics] is recommended (which also contains the
-  /// start and end of each line).
-  List<int> getLineBoundary(int offset);
+  /// metrics, so use it sparingly.
+  TextRange getLineBoundary(TextPosition position);
 
   /// Returns a list of text boxes that enclose all placeholders in the paragraph.
   ///