Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2cb7e5a

Browse files
committed
fix analysis errors
1 parent 29fa093 commit 2cb7e5a

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,9 +726,11 @@ class CkStrutStyle implements ui.StrutStyle {
726726
}
727727

728728
@override
729-
int get hashCode => Object.hash(
729+
int get hashCode {
730+
final List<String>? fontFamilyFallback = _fontFamilyFallback;
731+
return Object.hash(
730732
_fontFamily,
731-
_fontFamilyFallback != null ? Object.hashAll(_fontFamilyFallback) : null,
733+
fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
732734
_fontSize,
733735
_height,
734736
_leading,
@@ -737,6 +739,7 @@ class CkStrutStyle implements ui.StrutStyle {
737739
_fontStyle,
738740
_forceStrutHeight,
739741
);
742+
}
740743
}
741744

742745
SkFontStyle toSkFontStyle(ui.FontWeight? fontWeight, ui.FontStyle? fontStyle) {

lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -650,17 +650,20 @@ final class SkwasmStrutStyle extends SkwasmObjectWrapper<RawStrutStyle> implemen
650650
}
651651

652652
@override
653-
int get hashCode => Object.hash(
654-
_fontFamily,
655-
_fontFamilyFallback != null ? Object.hashAll(_fontFamilyFallback) : null,
656-
_fontSize,
657-
_height,
658-
_leading,
659-
_leadingDistribution,
660-
_fontWeight,
661-
_fontStyle,
662-
_forceStrutHeight,
663-
);
653+
int get hashCode {
654+
final List<String>? fontFamilyFallback = _fontFamilyFallback;
655+
return Object.hash(
656+
_fontFamily,
657+
fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
658+
_fontSize,
659+
_height,
660+
_leading,
661+
_leadingDistribution,
662+
_fontWeight,
663+
_fontStyle,
664+
_forceStrutHeight,
665+
);
666+
}
664667
}
665668

666669
class SkwasmParagraphStyle extends SkwasmObjectWrapper<RawParagraphStyle> implements ui.ParagraphStyle {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,9 +846,11 @@ class EngineStrutStyle implements ui.StrutStyle {
846846
}
847847

848848
@override
849-
int get hashCode => Object.hash(
849+
int get hashCode {
850+
final List<String>? fontFamilyFallback = _fontFamilyFallback;
851+
return Object.hash(
850852
_fontFamily,
851-
_fontFamilyFallback != null ? Object.hashAll(_fontFamilyFallback) : null,
853+
fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
852854
_fontSize,
853855
_height,
854856
_leading,
@@ -857,6 +859,7 @@ class EngineStrutStyle implements ui.StrutStyle {
857859
_fontStyle,
858860
_forceStrutHeight,
859861
);
862+
}
860863
}
861864

862865
/// Holds information for a placeholder in a paragraph.

lib/web_ui/test/canvaskit/text_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,23 @@ void testMain() {
105105
test('The default test font is used when a non-test fontFamily is specified', () {
106106
final String defaultTestFontFamily = testFonts.first;
107107

108-
expect(CkTextStyle(fontFamily: 'BogusFontFamily').fontFamily, defaultTestFontFamily);
109-
expect(CkParagraphStyle(fontFamily: 'BogusFontFamily').getTextStyle().fontFamily, defaultTestFontFamily);
108+
expect(CkTextStyle(fontFamily: 'BogusFontFamily').effectiveFontFamily, defaultTestFontFamily);
109+
expect(CkParagraphStyle(fontFamily: 'BogusFontFamily').getTextStyle().effectiveFontFamily, defaultTestFontFamily);
110110
expect(CkStrutStyle(fontFamily: 'BogusFontFamily'), CkStrutStyle(fontFamily: defaultTestFontFamily));
111111
});
112112

113113
test('The default test font is used when fontFamily is unspecified', () {
114114
final String defaultTestFontFamily = testFonts.first;
115115

116-
expect(CkTextStyle().fontFamily, defaultTestFontFamily);
117-
expect(CkParagraphStyle().getTextStyle().fontFamily, defaultTestFontFamily);
116+
expect(CkTextStyle().effectiveFontFamily, defaultTestFontFamily);
117+
expect(CkParagraphStyle().getTextStyle().effectiveFontFamily, defaultTestFontFamily);
118118
expect(CkStrutStyle(), CkStrutStyle(fontFamily: defaultTestFontFamily));
119119
});
120120

121121
test('Can specify test fontFamily to use', () {
122122
for (final String testFont in testFonts) {
123-
expect(CkTextStyle(fontFamily: testFont).fontFamily, testFont);
124-
expect(CkParagraphStyle(fontFamily: testFont).getTextStyle().fontFamily, testFont);
123+
expect(CkTextStyle(fontFamily: testFont).effectiveFontFamily, testFont);
124+
expect(CkParagraphStyle(fontFamily: testFont).getTextStyle().effectiveFontFamily, testFont);
125125
}
126126
});
127127
});

0 commit comments

Comments
 (0)