@@ -755,15 +755,15 @@ class EngineTextStyle implements ui.TextStyle {
755755 _decoration = decoration,
756756 _decorationColor = decorationColor,
757757 _decorationStyle = decorationStyle,
758+ _decorationThickness = decorationThickness,
758759 _fontWeight = fontWeight,
759760 _fontStyle = fontStyle,
760761 _textBaseline = textBaseline,
761- // TODO(b/128311960): when font fallback is supported, we should check
762- // for it here.
763762 _isFontFamilyProvided = fontFamily != null ,
764763 _fontFamily = fontFamily ?? '' ,
765- // TODO(b/128311960): add support for font family fallback.
766764 _fontFamilyFallback = fontFamilyFallback,
765+ // TODO: https://github.com/flutter/flutter/issues/56707
766+ _fontFeatures = fontFeatures,
767767 _fontSize = fontSize,
768768 _letterSpacing = letterSpacing,
769769 _wordSpacing = wordSpacing,
@@ -777,12 +777,14 @@ class EngineTextStyle implements ui.TextStyle {
777777 final ui.TextDecoration _decoration;
778778 final ui.Color _decorationColor;
779779 final ui.TextDecorationStyle _decorationStyle;
780+ final double _decorationThickness;
780781 final ui.FontWeight _fontWeight;
781782 final ui.FontStyle _fontStyle;
782783 final ui.TextBaseline _textBaseline;
783784 final bool _isFontFamilyProvided;
784785 final String _fontFamily;
785786 final List <String > _fontFamilyFallback;
787+ final List <ui.FontFeature > _fontFeatures;
786788 final double _fontSize;
787789 final double _letterSpacing;
788790 final double _wordSpacing;
@@ -841,6 +843,7 @@ class EngineTextStyle implements ui.TextStyle {
841843 _decoration,
842844 _decorationColor,
843845 _decorationStyle,
846+ _decorationThickness,
844847 _fontWeight,
845848 _fontStyle,
846849 _textBaseline,
@@ -864,6 +867,7 @@ class EngineTextStyle implements ui.TextStyle {
864867 'decoration: ${_decoration ?? "unspecified" }, '
865868 'decorationColor: ${_decorationColor ?? "unspecified" }, '
866869 'decorationStyle: ${_decorationStyle ?? "unspecified" }, '
870+ 'decorationThickness: ${_decorationThickness ?? "unspecified" }, '
867871 'fontWeight: ${_fontWeight ?? "unspecified" }, '
868872 'fontStyle: ${_fontStyle ?? "unspecified" }, '
869873 'textBaseline: ${_textBaseline ?? "unspecified" }, '
@@ -876,7 +880,8 @@ class EngineTextStyle implements ui.TextStyle {
876880 'locale: ${_locale ?? "unspecified" }, '
877881 'background: ${_background ?? "unspecified" }, '
878882 'foreground: ${_foreground ?? "unspecified" }, '
879- 'shadows: ${_shadows ?? "unspecified" }'
883+ 'shadows: ${_shadows ?? "unspecified" }, '
884+ 'fontFeatures: ${_fontFeatures ?? "unspecified" }'
880885 ')' ;
881886 } else {
882887 return super .toString ();
0 commit comments