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

Fix RectHeightStyle::kMax ascent computation bug #15106

Merged
GaryQian merged 3 commits into from
Jan 7, 2020
Merged

Fix RectHeightStyle::kMax ascent computation bug #15106

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc610c2
Fix bug, update tests, disable incompatible test on mac
GaryQian Jan 3, 2020
bef1d68
Fix additional test:
GaryQian Jan 3, 2020
c55a7bb
empty to kick tests
GaryQian Jan 6, 2020
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
3 changes: 1 addition & 2 deletions third_party/txt/src/txt/paragraph_txt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,8 +1753,7 @@ std::vector<Paragraph::TextBox> ParagraphTxt::GetRectsForRange(
} else if (rect_height_style == RectHeightStyle::kMax) {
for (const Paragraph::TextBox& box : kv.second.boxes) {
boxes.emplace_back(
SkRect::MakeLTRB(box.rect.fLeft,
line.baseline - line.unscaled_ascent,
SkRect::MakeLTRB(box.rect.fLeft, line.baseline - line.ascent,
box.rect.fRight, line.baseline + line.descent),
box.direction);
}
Expand Down
2 changes: 1 addition & 1 deletion third_party/txt/src/txt/paragraph_txt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class ParagraphTxt : public Paragraph {
FRIEND_TEST(ParagraphTest, DISABLED_ArabicParagraph);
FRIEND_TEST(ParagraphTest, SpacingParagraph);
FRIEND_TEST(ParagraphTest, LongWordParagraph);
FRIEND_TEST(ParagraphTest, KernScaleParagraph);
FRIEND_TEST_LINUX_ONLY(ParagraphTest, KernScaleParagraph);
FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, NewlineParagraph);
FRIEND_TEST_LINUX_ONLY(ParagraphTest, EmojiParagraph);
FRIEND_TEST_LINUX_ONLY(ParagraphTest, EmojiMultiLineRectsParagraph);
Expand Down
34 changes: 17 additions & 17 deletions third_party/txt/tests/paragraph_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4461,7 +4461,7 @@ TEST_F(ParagraphTest, LongWordParagraph) {
ASSERT_TRUE(Snapshot());
}

TEST_F(ParagraphTest, KernScaleParagraph) {
TEST_F(ParagraphTest, LINUX_ONLY(KernScaleParagraph)) {
float scale = 3.0f;

txt::ParagraphStyle paragraph_style;
Expand Down Expand Up @@ -5253,7 +5253,7 @@ TEST_F(ParagraphTest, LINUX_ONLY(StrutParagraph1)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 34.5, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 95);

Expand All @@ -5276,7 +5276,7 @@ TEST_F(ParagraphTest, LINUX_ONLY(StrutParagraph1)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
EXPECT_NEAR(boxes[0].rect.top(), 34.5, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 95);

Expand All @@ -5287,7 +5287,7 @@ TEST_F(ParagraphTest, LINUX_ONLY(StrutParagraph1)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 224.5, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 190, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 285);

Expand All @@ -5298,7 +5298,7 @@ TEST_F(ParagraphTest, LINUX_ONLY(StrutParagraph1)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 319.5);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 285);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 380);

Expand Down Expand Up @@ -5379,7 +5379,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 24, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);

Expand All @@ -5401,7 +5401,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
EXPECT_NEAR(boxes[0].rect.top(), 24, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);

Expand All @@ -5412,7 +5412,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 184, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 160, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 240);

Expand All @@ -5423,7 +5423,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 264);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 240);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 320);

Expand Down Expand Up @@ -5505,7 +5505,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 8, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 60);

Expand All @@ -5527,7 +5527,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
EXPECT_NEAR(boxes[0].rect.top(), 8, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 60);

Expand All @@ -5538,7 +5538,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 128);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 120);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 180);

Expand All @@ -5549,7 +5549,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 188);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 180);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 240);

Expand Down Expand Up @@ -5632,7 +5632,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 22.5, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
;
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
Expand All @@ -5655,7 +5655,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
EXPECT_NEAR(boxes[0].rect.top(), 22.5, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);

Expand All @@ -5666,7 +5666,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
EXPECT_NEAR(boxes[0].rect.top(), 182.5, 0.0001);
EXPECT_NEAR(boxes[0].rect.top(), 160, 0.0001);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 240);

Expand All @@ -5677,7 +5677,7 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 262.5);
EXPECT_FLOAT_EQ(boxes[0].rect.top(), 240);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 320);

Expand Down