add test

Author: LongCatIsLooong

lib/ui/text.dart

@@ -6,6 +6,7 @@ part of dart.ui;
 /// A [TextStyle.height] value that indicates the text span should take
 /// the height defined by the font, which may not be exactly the height of
 /// [TextStyle.fontSize].
+// To change the sentinel value, search for "kTextHeightNone" in the source code.
 const double kTextHeightNone = 0.0;
 
 /// Whether to use the italic type variation of glyphs in the font.
@@ -1830,6 +1831,7 @@ class TextStyle {
   @override
   String toString() {
     final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    final String heightText = _encoded[0] & 0x02000 == 0x02000  ? (_height == kTextHeightNone ? 'kTextHeightNone' : '${_height}x') : 'unspecified';
     return 'TextStyle('
              'color: ${              _encoded[0] & 0x00002 == 0x00002  ? Color(_encoded[1])                           : "unspecified"}, '
              'decoration: ${         _encoded[0] & 0x00004 == 0x00004  ? TextDecoration._(_encoded[2])                : "unspecified"}, '
@@ -1848,7 +1850,7 @@ class TextStyle {
              'fontSize: ${           _encoded[0] & 0x00400 == 0x00400  ? _fontSize                                    : "unspecified"}, '
              'letterSpacing: ${      _encoded[0] & 0x00800 == 0x00800  ? "${_letterSpacing}x"                         : "unspecified"}, '
              'wordSpacing: ${        _encoded[0] & 0x01000 == 0x01000  ? "${_wordSpacing}x"                           : "unspecified"}, '
-             'height: ${             _encoded[0] & 0x02000 == 0x02000  ? "${_height}x"                                : "unspecified"}, '
+             'height: $heightText, '
              'leadingDistribution: ${_leadingDistribution ?? "unspecified"}, '
              'locale: ${             _encoded[0] & 0x04000 == 0x04000  ? _locale                                      : "unspecified"}, '
              'background: ${         _encoded[0] & 0x08000 == 0x08000  ? _background                                  : "unspecified"}, '

lib/ui/text/paragraph_builder.cc

@@ -30,6 +30,8 @@
 namespace flutter {
 namespace {
 
+const double kTextHeightNone = 0.0;
+
 // TextStyle
 
 const int kTSLeadingDistributionIndex = 0;
@@ -445,7 +447,7 @@ void ParagraphBuilder::pushStyle(const tonic::Int32List& encoded,
 
   if (mask & kTSHeightMask) {
     style.height = height;
-    style.has_height_override = style.height != 0;
+    style.has_height_override = style.height != kTextHeightNone;
   }
 
   if (mask & kTSLocaleMask) {

lib/web_ui/lib/text.dart

@@ -6,6 +6,7 @@ part of ui;
 
 // This constant must be consistent with `kTextHeightNone` defined in
 // flutter/lib/ui/text.dart.
+// To change the sentinel value, search for "kTextHeightNone" in the source code.
 const double kTextHeightNone = 0.0;
 
 enum FontStyle {

lib/web_ui/skwasm/text/text_style.cpp

@@ -6,6 +6,8 @@
 #include "../wrappers.h"
 #include "third_party/skia/modules/skparagraph/include/Paragraph.h"
 
+const double kTextHeightNone = 0.0;
+
 using namespace skia::textlayout;
 using namespace Skwasm;
 
@@ -96,7 +98,7 @@ SKWASM_EXPORT void textStyle_setWordSpacing(TextStyle* style,
 
 SKWASM_EXPORT void textStyle_setHeight(TextStyle* style, SkScalar height) {
   style->setHeight(height);
-  style->setHeightOverride(height != 0.0);
+  style->setHeightOverride(height != kTextHeightNone);
 }
 
 SKWASM_EXPORT void textStyle_setHalfLeading(TextStyle* style,

testing/dart/paragraph_test.dart

@@ -349,4 +349,15 @@ void main() {
         expect(metrics, hasLength(1));
     }
   });
+
+  test('kTextHeightNone unsets the height multiplier', () {
+    const double fontSize = 10;
+    const String text = 'A';
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(fontSize: fontSize, height: 10));
+    builder.pushStyle(TextStyle(height: kTextHeightNone));
+    builder.addText(text);
+    final Paragraph paragraph = builder.build()
+      ..layout(const ParagraphConstraints(width: 1000));
+    expect(paragraph.height, fontSize);
+  });
 }

testing/dart/text_test.dart

@@ -54,12 +54,14 @@ void testParagraphStyle() {
   final ParagraphStyle ps1 = ParagraphStyle(textDirection: TextDirection.rtl, fontSize: 14.0);
   final ParagraphStyle ps2 = ParagraphStyle(textAlign: TextAlign.center, fontWeight: FontWeight.w800, fontSize: 10.0, height: 100.0);
   final ParagraphStyle ps3 = ParagraphStyle(fontWeight: FontWeight.w700, fontSize: 12.0, height: 123.0);
+  final ParagraphStyle ps4 = ParagraphStyle(fontWeight: FontWeight.w700, fontSize: 12.0, height: kTextHeightNone);
 
   test('ParagraphStyle toString works', () {
     expect(ps0.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: TextDirection.ltr, fontWeight: unspecified, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 14.0, height: unspecified, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
     expect(ps1.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: TextDirection.rtl, fontWeight: unspecified, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 14.0, height: unspecified, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
     expect(ps2.toString(), equals('ParagraphStyle(textAlign: TextAlign.center, textDirection: unspecified, fontWeight: FontWeight.w800, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 10.0, height: 100.0x, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
     expect(ps3.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: unspecified, fontWeight: FontWeight.w700, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 12.0, height: 123.0x, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
+    expect(ps4.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: unspecified, fontWeight: FontWeight.w700, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 12.0, height: unspecified, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
   });
 }
 
@@ -69,6 +71,7 @@ void testTextStyle() {
   final TextStyle ts2 = TextStyle(fontFamily: 'test');
   final TextStyle ts3 = TextStyle(fontFamily: 'foo', fontFamilyFallback: <String>['Roboto', 'test']);
   final TextStyle ts4 = TextStyle(leadingDistribution: TextLeadingDistribution.even);
+  final TextStyle ts5 = TextStyle(height: kTextHeightNone);
 
   test('TextStyle toString works', () {
     expect(
@@ -91,6 +94,10 @@ void testTextStyle() {
       ts4.toString(),
       equals('TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, decorationThickness: unspecified, fontWeight: unspecified, fontStyle: unspecified, textBaseline: unspecified, fontFamily: unspecified, fontFamilyFallback: unspecified, fontSize: unspecified, letterSpacing: unspecified, wordSpacing: unspecified, height: unspecified, leadingDistribution: TextLeadingDistribution.even, locale: unspecified, background: unspecified, foreground: unspecified, shadows: unspecified, fontFeatures: unspecified, fontVariations: unspecified)'),
     );
+    expect(
+      ts5.toString(),
+      equals('TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, decorationThickness: unspecified, fontWeight: unspecified, fontStyle: unspecified, textBaseline: unspecified, fontFamily: unspecified, fontFamilyFallback: unspecified, fontSize: unspecified, letterSpacing: unspecified, wordSpacing: unspecified, height: kTextHeightNone, leadingDistribution: unspecified, locale: unspecified, background: unspecified, foreground: unspecified, shadows: unspecified, fontFeatures: unspecified, fontVariations: unspecified)'),
+    );
   });
 }