Revert of Use SkTypeface::getBounds() in bounding-box calculations.

src/core/SkRecordDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRecordDraw.h"
 #include "SkPatchUtils.h"
-#include "SkTypeface.h"
 
 void SkRecordDraw(const SkRecord& record,
                   SkCanvas* canvas,
                   const SkBBoxHierarchy* bbh,
                   SkDrawPictureCallback* callback) {
     SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
 
     if (bbh) {
         // Draw only ops that affect pixels in the canvas's current clip.
         // The SkRecord and BBH were recorded in identity space.  This canvas
@@ skipping 417 matching lines @@
             left  = SkMinScalar(left,  op.xpos[i]);
             right = SkMaxScalar(right, op.xpos[i]);
         }
         SkRect dst = { left, op.y, right, op.y };
         AdjustTextForFontMetrics(&dst, op.paint);
         return this->adjustAndMap(dst, &op.paint);
     }
     Bounds bounds(const DrawTextOnPath& op) const {
         SkRect dst = op.path.getBounds();
 
-        // We don't know how the text will curve aroudn the path, so
-        // pad all sides by the maximum padding in any direction we'd normally apply.
+        // Pad all sides by the maximum padding in any direction we'd normally apply.
         SkRect pad = { 0, 0, 0, 0};
         AdjustTextForFontMetrics(&pad, op.paint);
-        SkScalar max = SkTMax(SkTMax(-pad.fLeft, pad.fRight),
-                              SkTMax(-pad.fTop, pad.fBottom));
-        dst.outset(max, max);
+
+        // 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);
 
         return this->adjustAndMap(dst, &op.paint);
     }
 
     Bounds bounds(const DrawTextBlob& op) const {
         SkRect dst = op.blob->bounds();
         dst.offset(op.x, op.y);
         return this->adjustAndMap(dst, &op.paint);
     }
 
     static void AdjustTextForFontMetrics(SkRect* rect, const SkPaint& paint) {
-        // rect was built from only the text's origin points, so we need
-        // to outset it by the worst-case bounds of the typeface.
-        SkAutoTUnref<SkTypeface> au;
-        SkTypeface* tf = paint.getTypeface();
-        if (!tf) {
-            au.reset(SkTypeface::RefDefault());
-            tf = au.get();
-        }
-        const SkScalar size = paint.getTextSize();
-        const SkRect tb = tf->getBounds();
-        rect->fLeft   += size * tb.fLeft;
-        rect->fRight  += size * tb.fRight;
-        rect->fTop    += size * tb.fTop;
-        rect->fBottom += size * tb.fBottom;
+#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);
 #ifdef SK_DEBUG
         SkPaint::FontMetrics metrics;
         paint.getFontMetrics(&metrics);
-        // Our numbers are so close to correct now that we're sometimes _slightly_ under.  Add
-        // a little fudge factor here to make sure the assert just catches really bad failures.
-        const SkScalar kFudge = 0.0625f;
-        SkRect fudged = {
-            size * (tb.fLeft   - kFudge),
-            size * (tb.fTop    - kFudge),
-            size * (tb.fRight  + kFudge),
-            size * (tb.fBottom + kFudge),
-        };
-        SkRect correct = { metrics.fXMin, metrics.fTop, metrics.fXMax, metrics.fBottom };
+        correct.fLeft   += metrics.fXMin;
+        correct.fTop    += metrics.fTop;
+        correct.fRight  += metrics.fXMax;
+        correct.fBottom += metrics.fBottom;
         // See skia:2862 for why we ignore small text sizes.
-        SkASSERTF(paint.getTextSize() < 0.001f || fudged.contains(correct),
-                  "%f %f %f %f vs. %f %f %f %f, text size %f\n",
-                  size*tb.fLeft, size*tb.fTop, size*tb.fRight, size*tb.fBottom,
-                  metrics.fXMin, metrics.fTop, metrics.fXMax,  metrics.fBottom,
-                  paint.getTextSize());
+        SkASSERTF(paint.getTextSize() < 0.001f || rect->contains(correct),
+                  "%f %f %f %f vs. %f %f %f %f\n",
+                  -xPad, -yPad, +xPad, +yPad,
+                  metrics.fXMin, metrics.fTop, metrics.fXMax, metrics.fBottom);
 #endif
     }
 
     // Returns true if rect was meaningfully adjusted for the effects of paint,
     // false if the paint could affect the rect in unknown ways.
     static bool AdjustForPaint(const SkPaint* paint, SkRect* rect) {
         if (paint) {
             if (paint->canComputeFastBounds()) {
                 *rect = paint->computeFastBounds(*rect, rect);
                 return true;
@@ skipping 51 matching lines @@
     // Used to track the bounds of Save/Restore blocks and the control ops inside them.
     SkTDArray<SaveBounds> fSaveStack;
     SkTDArray<unsigned>   fControlIndices;
 };
 
 }  // namespace SkRecords
 
 void SkRecordFillBounds(const SkRecord& record, SkBBoxHierarchy* bbh) {
     SkRecords::FillBounds(record, bbh);
 }