Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions third_party/txt/src/txt/paragraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ class Paragraph {

enum Affinity { UPSTREAM, DOWNSTREAM };

// TODO(garyq): Implement kIncludeLineSpacing and kExtendEndOfLine

// Options for various types of bounding boxes provided by
// GetRectsForRange(...).
enum class RectHeightStyle {
Expand Down
20 changes: 0 additions & 20 deletions third_party/txt/tests/paragraph_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3138,11 +3138,6 @@ TEST_F(ParagraphTest, FontFallbackParagraph) {
0);
}

// Disabled due to Skia depending on platform to get metrics, which
// results in presubmit runs to have different values.
//
// TODO(garyq): Re-enable strut tests, allow font metric fakery, or
// consolidate skia font metric behavior.
TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph1)) {
// The chinese extra height should be absorbed by the strut.
const char* text = "01234満毎冠p来É本可\nabcd\n満毎É行p昼本可";
Expand Down Expand Up @@ -3271,11 +3266,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph1)) {
ASSERT_TRUE(Snapshot());
}

// Disabled due to Skia depending on platform to get metrics, which
// results in presubmit runs to have different values.
//
// TODO(garyq): Re-enable strut tests, allow font metric fakery, or
// consolidate skia font metric behavior.
TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
// This string is all one size and smaller than the strut metrics.
const char* text = "01234ABCDEFGH\nabcd\nABCDEFGH";
Expand Down Expand Up @@ -3400,11 +3390,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
ASSERT_TRUE(Snapshot());
}

// Disabled due to Skia depending on platform to get metrics, which
// results in presubmit runs to have different values.
//
// TODO(garyq): Re-enable strut tests, allow font metric fakery, or
// consolidate skia font metric behavior.
TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
// The strut is too small to absorb the extra chinese height, but the english
// second line height is increased due to strut.
Expand Down Expand Up @@ -3530,11 +3515,6 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
ASSERT_TRUE(Snapshot());
}

// Disabled due to Skia depending on platform to get metrics, which
// results in presubmit runs to have different values.
//
// TODO(garyq): Re-enable strut tests, allow font metric fakery, or
// consolidate skia font metric behavior.
TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
// The strut is too small to absorb the extra chinese height, but the english
// second line height is increased due to strut.
Expand Down