diff options
| author |  mtklein <mtklein@google.com> | 2014-10-29 16:07:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-29 16:07:11 -0700 |
| commit | ed167acb7b494bf0aece05ac8a68b560782b027c (patch) | |
| tree | 74dcd878e12b0f728f9da03e185dbc9c92ce1b46 /tests | |
| parent | 67c71203a4e2e4f4be0a4e2293bec3a1bc1b07c8 (diff) | |
Revert of Use SkTypeface::getBounds() in bounding-box calculations. (patchset #5 id:80001 of https://codereview.chromium.org/680363003/)
Reason for revert:
Mac mini asserting
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
>
> CQ_EXTRA_TRYBOTS=client.skia:Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/c51add674dfb89b988a7fbc05f41838c203f9dcd
TBR=reed@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/690833002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RecordDrawTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp index 2476c03984..6105c00f7f 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); - // 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 |