@@ -3138,11 +3138,6 @@ TEST_F(ParagraphTest, FontFallbackParagraph) {
31383138 0 );
31393139}
31403140
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.
31463141TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph1)) {
31473142 // The chinese extra height should be absorbed by the strut.
31483143 const char * text = " 01234満毎冠p来É本可\n abcd\n 満毎É行p昼本可" ;
@@ -3271,11 +3266,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph1)) {
32713266 ASSERT_TRUE (Snapshot ());
32723267}
32733268
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.
32793269TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
32803270 // This string is all one size and smaller than the strut metrics.
32813271 const char * text = " 01234ABCDEFGH\n abcd\n ABCDEFGH" ;
@@ -3400,11 +3390,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
34003390 ASSERT_TRUE (Snapshot ());
34013391}
34023392
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.
34083393TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
34093394 // The strut is too small to absorb the extra chinese height, but the english
34103395 // second line height is increased due to strut.
@@ -3530,11 +3515,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
35303515 ASSERT_TRUE (Snapshot ());
35313516}
35323517
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.
35383518TEST_F (ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
35393519 // The strut is too small to absorb the extra chinese height, but the english
35403520 // second line height is increased due to strut.
0 commit comments