hack to expand 'pad' to account for very wide glyphs

src/core/SkBBoxRecord.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxRecord.h"
 
@@ skipping 147 matching lines @@
     }
 }
 
 void SkBBoxRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
                                   const SkRect& dst, const SkPaint* paint) {
     if (this->transformBounds(dst, paint)) {
         INHERITED::drawBitmapNine(bitmap, center, dst, paint);
     }
 }
 
+// Hack to work-around https://code.google.com/p/chromium/issues/detail?id=373785
+// This logic assums that 'pad' is enough to add to the left and right to account for
+// big glyphs. For the font in question (a logo font) the glyphs is much wider than just
+// the pointsize (approx 3x wider).
+// As a temp work-around, we scale-up pad.
+// A more correct fix might be to add fontmetrics.fMaxX, but we don't have that value in hand
+// at the moment, and (possibly) the value in the font may not be accurate (but who knows).
+//
+static SkScalar hack_373785_amend_pad(SkScalar pad) {
+    return pad * 4;
+}
+
 void SkBBoxRecord::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                                  const SkPaint& paint) {
     SkRect bbox;
     bbox.set(pos, paint.countText(text, byteLength));
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
     bbox.fTop += metrics.fTop;
     bbox.fBottom += metrics.fBottom;
 
     // pad on left and right by half of max vertical glyph extents
     SkScalar pad = (metrics.fTop - metrics.fBottom) / 2;
+    pad = hack_373785_amend_pad(pad);
     bbox.fLeft += pad;
     bbox.fRight -= pad;
 
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::onDrawPosText(text, byteLength, pos, paint);
     }
 }
 
 void SkBBoxRecord::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                                   SkScalar constY, const SkPaint& paint) {
@@ skipping 16 matching lines @@
     for (size_t i = 0; i < numChars; ++i) {
         if (xpos[i] < bbox.fLeft) {
             bbox.fLeft = xpos[i];
         }
         if (xpos[i] > bbox.fRight) {
             bbox.fRight = xpos[i];
         }
     }
 
     // pad horizontally by max glyph height
+    pad = hack_373785_amend_pad(pad);
     bbox.fLeft  += pad;
     bbox.fRight -= pad;
 
     bbox.fTop    = top + constY;
     bbox.fBottom = bottom + constY;
 
     if (!this->transformBounds(bbox, &paint)) {
         return;
     }
     // This is the equivalent of calling:
@@ skipping 67 matching lines @@
     }
 
     if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
         this->getTotalMatrix().mapRect(&outBounds);
         this->handleBBox(outBounds);
         return true;
     }
 
     return false;
 }