From 02d2b9831579173e783569530ab7bae08de907e9 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 16 Dec 2014 06:17:54 -0800 Subject: Use SkPaint::getFontBounds() for text bounding boxes in pictures. Now that SkTextBlobs have landed, this is a perf no-op, but it at least lets us eliminate a bunch of questionable hacks. CQ_EXTRA_TRYBOTS=client.skia:Test-Win7-ShuttleA-HD2000-x86-Debug-Trybot,Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug-Trybot BUG=skia: Review URL: https://codereview.chromium.org/805983003 --- src/core/SkRecordDraw.cpp | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'src/core/SkRecordDraw.cpp') diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp index 86621f2170..ba401005fa 100644 --- a/src/core/SkRecordDraw.cpp +++ b/src/core/SkRecordDraw.cpp @@ -487,16 +487,13 @@ private: Bounds bounds(const DrawTextOnPath& op) const { SkRect dst = op.path.getBounds(); - // Pad all sides by the maximum padding in any direction we'd normally apply. + // We don't know how the text will curve around the path, so + // pad all sides by the maximum padding in any direction we'd normally apply. SkRect pad = { 0, 0, 0, 0}; AdjustTextForFontMetrics(&pad, op.paint); - - // That maximum padding happens to always be the right pad today. - SkASSERT(pad.fLeft == -pad.fRight); - SkASSERT(pad.fTop == -pad.fBottom); - SkASSERT(pad.fRight > pad.fBottom); - dst.outset(pad.fRight, pad.fRight); - + SkScalar max = SkTMax(SkTMax(-pad.fLeft, pad.fRight), + SkTMax(-pad.fTop, pad.fBottom)); + dst.outset(max, max); return this->adjustAndMap(dst, &op.paint); } @@ -511,25 +508,21 @@ private: } static void AdjustTextForFontMetrics(SkRect* rect, const SkPaint& paint) { -#ifdef SK_DEBUG - SkRect correct = *rect; -#endif - // crbug.com/373785 ~~> xPad = 4x yPad - // crbug.com/424824 ~~> bump yPad from 2x text size to 2.5x - const SkScalar yPad = 2.5f * paint.getTextSize(), - xPad = 4.0f * yPad; - rect->outset(xPad, yPad); + // rect was built from only the text's origin points, so we need to + // outset it by the worst-case bounds of the font. + const SkRect bounds = paint.getFontBounds(); + rect->fLeft += bounds.fLeft; + rect->fRight += bounds.fRight; + rect->fTop += bounds.fTop; + rect->fBottom += bounds.fBottom; #ifdef SK_DEBUG SkPaint::FontMetrics metrics; paint.getFontMetrics(&metrics); - correct.fLeft += metrics.fXMin; - correct.fTop += metrics.fTop; - correct.fRight += metrics.fXMax; - correct.fBottom += metrics.fBottom; + const SkRect correct = { metrics.fXMin, metrics.fTop, metrics.fXMax, metrics.fBottom }; // See skia:2862 for why we ignore small text sizes. - SkASSERTF(paint.getTextSize() < 0.001f || rect->contains(correct), + SkASSERTF(paint.getTextSize() < 0.001f || bounds.contains(correct), "%f %f %f %f vs. %f %f %f %f\n", - -xPad, -yPad, +xPad, +yPad, + bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, metrics.fXMin, metrics.fTop, metrics.fXMax, metrics.fBottom); #endif } -- cgit v1.2.3