@@ -3138,11 +3138,6 @@ TEST_F(ParagraphTest, FontFallbackParagraph) {
3138
3138
0 );
3139
3139
}
3140
3140
3141
- // Disabled due to Skia depending on platform to get metrics, which
3142
- // results in presubmit runs to have different values.
3143
- //
3144
- // TODO(garyq): Re-enable strut tests, allow font metric fakery, or
3145
- // consolidate skia font metric behavior.
3146
3141
TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph1)) {
3147
3142
// The chinese extra height should be absorbed by the strut.
3148
3143
const char * text = " 01234満毎冠p来É本可\n abcd\n 満毎É行p昼本可" ;
@@ -3271,11 +3266,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph1)) {
3271
3266
ASSERT_TRUE (Snapshot ());
3272
3267
}
3273
3268
3274
- // Disabled due to Skia depending on platform to get metrics, which
3275
- // results in presubmit runs to have different values.
3276
- //
3277
- // TODO(garyq): Re-enable strut tests, allow font metric fakery, or
3278
- // consolidate skia font metric behavior.
3279
3269
TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
3280
3270
// This string is all one size and smaller than the strut metrics.
3281
3271
const char * text = " 01234ABCDEFGH\n abcd\n ABCDEFGH" ;
@@ -3400,11 +3390,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
3400
3390
ASSERT_TRUE (Snapshot ());
3401
3391
}
3402
3392
3403
- // Disabled due to Skia depending on platform to get metrics, which
3404
- // results in presubmit runs to have different values.
3405
- //
3406
- // TODO(garyq): Re-enable strut tests, allow font metric fakery, or
3407
- // consolidate skia font metric behavior.
3408
3393
TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
3409
3394
// The strut is too small to absorb the extra chinese height, but the english
3410
3395
// second line height is increased due to strut.
@@ -3530,11 +3515,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
3530
3515
ASSERT_TRUE (Snapshot ());
3531
3516
}
3532
3517
3533
- // Disabled due to Skia depending on platform to get metrics, which
3534
- // results in presubmit runs to have different values.
3535
- //
3536
- // TODO(garyq): Re-enable strut tests, allow font metric fakery, or
3537
- // consolidate skia font metric behavior.
3538
3518
TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
3539
3519
// The strut is too small to absorb the extra chinese height, but the english
3540
3520
// second line height is increased due to strut.
0 commit comments