Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: tests/RecordDrawTest.cpp

Issue 680363003: Use SkTypeface::getBounds() in bounding-box calculations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fudge differently Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkRecordDraw.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/RecordDrawTest.cpp
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 6105c00f7f1093842d9fc2e808a753f2c7595f7b..2476c039843228f413909fd3669123c650b52b3e 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -166,11 +166,11 @@ DEF_TEST(RecordDraw_TextBounds, r) {
SkRecordFillBounds(record, &bbh);
REPORTER_ASSERT(r, bbh.fEntries.count() == 2);
- // We can make these next assertions confidently because SkRecordFillBounds
- // builds its bounds by overestimating font metrics in a platform-independent way.
- // If that changes, these tests will need to be more flexible.
- REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[0].bounds, SkRect::MakeLTRB(-110, 0, 140, 60)));
- REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[1].bounds, SkRect::MakeLTRB(-80, 20, 180, 100)));
+ // Font metrics are somewhat platform dependent. These assertions may need to be adjusted.
+ // However, these particular numbers are left over from the days when we used to wildly
+ // overestimate font metrics, so these assertions should be pretty conservative.
+ REPORTER_ASSERT(r, SkRect::MakeLTRB(-110, 0, 140, 60) .contains(bbh.fEntries[0].bounds));
+ REPORTER_ASSERT(r, SkRect::MakeLTRB(-80, 20, 180, 100).contains(bbh.fEntries[1].bounds));
}
// Base test to ensure start/stop range is respected
« no previous file with comments | « src/core/SkRecordDraw.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698