Revert of Use SkTypeface::getBounds() in bounding-box calculations. (patchset #3 id:40001 of https://codereview.chromium.org/680363003/)
Reason for revert:
http://build.chromium.org/p/client.skia/builders/Test-Win7-ShuttleA-HD2000-x86-Debug/builds/97/steps/nanobench/logs/stdio
Original issue's description:
> Use SkTypeface::getBounds() in bounding-box calculations.
>
> This should produce tighter conservative bounding boxes for text than the
> approximation code it replaces.
>
> Recording performance is neutral on my desktop. Playback performance
> improves by up to 15% on text heavy pages, e.g.
>
> desk_pokemonwiki.skp_1 3.24ms -> 2.83ms 0.87x
> desk_baidu.skp_1 1.91ms -> 1.58ms 0.83x
>
> Committed: https://skia.googlesource.com/skia/+/bf8dc343df4fbdcb8af546eb68b640e011a33489
TBR=reed@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/685173002
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 2476c03..6105c00 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -166,11 +166,11 @@
SkRecordFillBounds(record, &bbh);
REPORTER_ASSERT(r, bbh.fEntries.count() == 2);
- // 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));
+ // 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)));
}
// Base test to ensure start/stop range is respected